dsx 1 年之前
父節點
當前提交
388f1f15f8

+ 6 - 1
src/main/java/com/fdkankan/external/service/impl/SceneOfflinePackagePushServiceImpl.java

@@ -363,12 +363,17 @@ public class SceneOfflinePackagePushServiceImpl extends ServiceImpl<SceneOffline
 
             ScenePlus scenePlus = scenePlusService.getByNum(num);
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
+            String title = scenePlus.getTitle();
+            if("laser".equals(zipType)){
+                Scene scene = sceneService.getBySceneCode(scenePlus.getNum());
+                title = scene.getTitle();
+            }
             Map<String, Object> params = new HashMap<>();
             params.put("id", id);
             params.put("action", "save");
             params.put("fileName", num.concat(".zip"));
             params.put("num", num);
-            params.put("title", scenePlus.getTitle());
+            params.put("title", title);
             params.put("zipType", zipType);
             params.put("downloadUrl", downloadUrl);
             params.put("version", push.getVersion());

+ 15 - 0
src/main/resources/application-prod.yml

@@ -23,6 +23,7 @@ host:
   4dkk:
     manage: https://www.4dkankan.com
     scene: https://www.4dkankan.com
+  laser: https://laser.4dkankan.com
 api:
   4dkk:
     manage:
@@ -32,6 +33,8 @@ api:
       downloadProcess: /service/manage/scene/downloadProcess?num=%s
     scene:
       getInfo: /service/scene/getInfo?num=%s
+  laser:
+    downOfflineScene: /laser/4dage/downOfflineScene
 
 forest:
   ## 日志总开关,打开/关闭Forest请求/响应日志(默认为 true)
@@ -64,6 +67,18 @@ mybatis-flex:
       url: jdbc:mysql://8.129.209.131:13306/fdkk_laser
       username: laser
       password: JK20220120&JIK
+oss:
+  host:
+    laser:
+      old: https://laser-oss.4dkankan.com
+      new: https://zgwwzzzx-laser-download.4dage.com
+    4dkk:
+      old: https://4dkk.4dage.com
+      new: https://zgwwzzzx-download.4dage.com
+
+file:
+  offlineZip:
+    dir: /mnt/external/temp/