1

src/main/java/com/fdkankan/fusion/FusionApplication.java

@@ -24,10 +24,9 @@ public class FusionApplication  implements CommandLineRunner {
     private String queryPath;
     @Value("${spring.profiles.active}")
     private String environment;
-    @Value("${4dkk.laserService.basePath}")
     private String laserWebsite;
-    @Value("${4dkk.fdService.basePath}")
-    private String meshWebsite;
+    @Value("${fusion.website}")
+    private String website;
     @Value("${upload.query-path-ss}")
     private String ssQueryPath;
     public static void main(String[] args) {
@@ -39,9 +38,8 @@ public class FusionApplication  implements CommandLineRunner {
         CacheUtil.uploadType = uploadType;
         CacheUtil.queryPath = queryPath;
         CacheUtil.environment = environment;
-        CacheUtil.laserWebsite = laserWebsite;
-        CacheUtil.meshWebsite = meshWebsite;
         CacheUtil.ssQueryPath = ssQueryPath;
+        CacheUtil.website = website;
 
     }
 }

src/main/java/com/fdkankan/fusion/config/CacheUtil.java

@@ -6,8 +6,7 @@ public class CacheUtil {
     public static String ssQueryPath;
     public static String basePath ="/mnt/";
     public static String environment;
-    public static String laserWebsite;
-    public static String meshWebsite;
+    public static String website;
 
 
 }

src/main/java/com/fdkankan/fusion/response/FusionAndSceneVo.java

@@ -21,12 +21,9 @@ public class FusionAndSceneVo {
     public String getWebSite() {
         if(StringUtils.isNotBlank(num) && sceneType != null) {
             if(NumTypeUtils.isLaser(sceneType)){
-                if(CacheUtil.environment.contains("prod")){
-                    return CacheUtil.laserWebsite + "/index.html?m="+num;
-                }
-                return CacheUtil.laserWebsite + "/uat/index.html?m="+num;
+                return CacheUtil.website + "/swss/uat/index.html?m="+num;
             }else {
-                return CacheUtil.meshWebsite + "/spg.html?m="+num;
+                return CacheUtil.website + "/swkk/spg.html?m="+num;
             }
         }
         return webSite;

src/main/java/com/fdkankan/fusion/response/SceneVo.java

@@ -81,12 +81,9 @@ public class SceneVo extends Model {
     public String getWebSite() {
         if(StringUtils.isNotBlank(num) && type != null) {
             if(NumTypeUtils.isLaser(type)){
-                if(CacheUtil.environment.contains("prod")){
-                    return CacheUtil.laserWebsite + "/index.html?m="+num;
-                }
-                return CacheUtil.laserWebsite + "/uat/index.html?m="+num;
+                return CacheUtil.website + "/swss/uat/index.html?m="+num;
             }else {
-                return CacheUtil.meshWebsite + "/spg.html?m="+num;
+                return CacheUtil.website + "/swkk/spg.html?m="+num;
             }
         }
         return webSite;