update

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -2,6 +2,7 @@ package com.fdkankan.scene;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.CommonSuccessStatus;
@@ -47,6 +48,13 @@ public class SceneApplication {
             writer.write("1");
             writer.flush();
         }
+        String setting = fdkkLaserConfig.getBinPath() + File.separator + "setting.json";
+        String data = FileUtil.readString(setting, "UTF-8");
+        JSONObject config = JSONObject.parseObject(data);
+        Integer javaPort = config.getInteger("javaPort");
+        fdkkLaserConfig.setLaserPort(javaPort);
+
+
         RedisUtil redisUtil = SpringUtil.getBean(RedisUtil.class);
         redisUtil.del(RedisKey.SCENE_DOWNLOAD_ING);
         Set keyFormatSet = redisUtil.keys(String.format(keyFormat, "*"));

src/main/java/com/fdkankan/scene/config/FdkkLaserConfig.java

@@ -57,6 +57,16 @@ public class FdkkLaserConfig {
      */
     public String buildModelPath;
 
+    public Integer laserPort;
+
+    public Integer getLaserPort() {
+        return laserPort;
+    }
+
+    public void setLaserPort(Integer laserPort) {
+        this.laserPort = laserPort;
+    }
+
     @PostConstruct
     private void init() {
         FileUtil.mkdir(FdkkLaserConfig.profile);

src/main/java/com/fdkankan/scene/service/impl/SceneDownloadLogServiceImpl.java

@@ -66,6 +66,9 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
     @Autowired
     private ISceneService sceneService;
 
+    @Autowired
+    private  FdkkLaserConfig fdkkLaserConfig;
+
 
     @Override
     public ResultData downOfflineScene(String num) {
@@ -104,7 +107,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
                 download = true;
             }
             if(version == sceneDownloadLog.getSceneVersion()){
-                String url=this.publicUrl+":"+serviceConfig.getServerPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
+                String url=this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
                 result.put("status", 2);
                 result.put("url",url);
                 String key=String.format(RedisKey.PREFIX_DOWNLOAD_PROGRESS_V4,num);
@@ -159,7 +162,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
                             .set(SceneDownloadLog::getDownloadUrl,downLoadProgressBean.getUrl())
                             .set(SceneDownloadLog::getStatus,1)
             );
-            downLoadProgressBean.setUrl(this.publicUrl+":"+serviceConfig.getServerPort()+ "/" + scene.getMapping() +downLoadProgressBean.getUrl());
+            downLoadProgressBean.setUrl(this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+ "/" + scene.getMapping() +downLoadProgressBean.getUrl());
         }
         return ResultData.ok(downLoadProgressBean);
     }