1

src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -19,8 +19,8 @@ public class FilePath {
 
     public final static String OFFLINE_PACKAGE_PATH = "/mnt/fusion/offline/offline_";
     public final static String OFFLINE_TEMPLATE_PATH = "/mnt/fusion/offline/template";
-    public final static String OFFLINE_RESOURCE_PACKAGE_PATH = OFFLINE_PACKAGE_PATH + "%s/www/package/resource/";
-    public final static String OFFLINE_OSS_PATH = OFFLINE_PACKAGE_PATH + "%s/www";
-    public final static String OFFLINE_LASER_OSS_PATH =  "/swss/%s/www/%s/";
+    public final static String OFFLINE_RESOURCE_PACKAGE_PATH = OFFLINE_PACKAGE_PATH + "%s/env/www/package/resource/";
+    public final static String OFFLINE_OSS_PATH = OFFLINE_PACKAGE_PATH + "%s/env/www";
+    public final static String OFFLINE_LASER_OSS_PATH =  "/swss/%s/env/www/%s/";
     public final static String LASER_OSS_PATH = "laser-prod/%s/data/%s/webcloud";
 }

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -398,19 +398,19 @@ public class CaseDownService {
                 jsonString = jsonString.replaceAll(key,replaceMap.get(key));
             }
         }
-        FileUtil.writeString(jsonString, FilePath.OFFLINE_PACKAGE_PATH+caseId+"/www/package/"+jsonDataName,"UTF-8");
+        FileUtil.writeString(jsonString, FilePath.OFFLINE_PACKAGE_PATH+caseId+"/env/www/package/"+jsonDataName,"UTF-8");
 
     }
 
     private void addReplaceMap(SceneVo sceneData,HashMap<String,String> map) {
         if(StringUtils.isNotBlank(sceneData.getCutModelPath())){
-            map.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/env/wwwroot/"));
         }
         if(StringUtils.isNotBlank(sceneData.getSurveillancePath())){
-            map.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum()+"/env/wwwroot/"));
         }
         if(StringUtils.isNotBlank(sceneData.getSceneJsonPath())){
-            map.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/wwwroot/"));
+            map.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum()+"/env/wwwroot/"));
         }
     }
 
@@ -418,6 +418,7 @@ public class CaseDownService {
     //http://127.0.0.1:8080/offline.html?caseId=362&app=1&share=1#/show/summary
 
     static String batName = "start-browser.bat";
+    static String batName2 = "信创环境启动（打开后选在终端运行）.sh";
    public void cpIndexHtml(Integer caseId){
        log.info("down-offline-cpIndexHtml:{}",caseId);
 
@@ -425,8 +426,13 @@ public class CaseDownService {
        FileUtil.copyContent(new File(FilePath.OFFLINE_TEMPLATE_PATH),new File(caseOfflinePath),true);
 
        String s = FileUtil.readString(caseOfflinePath + File.separator + batName, StandardCharsets.UTF_8);
-       String s1 = s.replaceAll("@caseId", String.valueOf(caseId));
-       FileUtil.writeString(s1, caseOfflinePath + File.separator + batName,"UTF-8");
+       s = s.replaceAll("@caseId", String.valueOf(caseId));
+       FileUtil.writeString(s, caseOfflinePath + File.separator + batName,"UTF-8");
+
+       String s1 = FileUtil.readString(caseOfflinePath + File.separator + batName2, StandardCharsets.UTF_8);
+       s1 = s1.replaceAll("@caseId", String.valueOf(caseId));
+       FileUtil.writeString(s1, caseOfflinePath + File.separator + batName2,"UTF-8");
+
    }
 
 
@@ -437,9 +443,9 @@ public class CaseDownService {
 
    public void downSwkk(Integer caseId,String num,Integer type){
 
-       String swkkPath = FilePath.OFFLINE_PACKAGE_PATH+caseId + "/www/swkk/"+num;
+       String swkkPath = FilePath.OFFLINE_PACKAGE_PATH+caseId + "/env/www/swkk/"+num;
        String swkkZipPath = swkkPath +".zip";
-       String swssPath = FilePath.OFFLINE_PACKAGE_PATH+caseId + "/www/swss/"+num;
+       String swssPath = FilePath.OFFLINE_PACKAGE_PATH+caseId + "/env/www/swss/"+num;
        String swssZipPath = swssPath +".zip";
 
        Integer isObj = 0;