计算完成时间

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

@@ -19,8 +19,8 @@ public class FilePath {
 
     public final static String FFMPEG_IMG_PATH  = LOCAL_BASE_PATH +"ffmpeg_imgs";
 
-    public final static String OFFLINE_PACKAGE_PATH = LOCAL_BASE_PATH+  "offline/offline_";
-    public final static String OFFLINE_TEMPLATE_PATH = LOCAL_BASE_PATH +"offline/template";
+    public final static String OFFLINE_PACKAGE_PATH = LOCAL_BASE_PATH+  "fusion/offline/offline_";
+    public final static String OFFLINE_TEMPLATE_PATH = LOCAL_BASE_PATH +"fusion/offline/template";
     public final static String OFFLINE_RESOURCE_PACKAGE_PATH  = "/www/package/resource/";
     public final static String OFFLINE_OSS_PATH = "/www/oss/";
     public final static String OFFLINE_LASER_OSS_PATH =  "/swss/%s/www/%s/";

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

@@ -358,12 +358,7 @@ public class CaseDownService {
     static String batName = "start-browser.bat";
    public void cpIndexHtml(Integer caseId,String caseOffPath) throws IOException {
        log.info("down-offline-cpIndexHtml:{}",caseOffPath);
-       File file = new File(FilePath.OFFLINE_TEMPLATE_PATH);
-       if(!file.exists()){
-           InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/offline/template");
-           FileUtils.copyInputStreamToFile(inputStream,file);
-       }
-       FileUtil.copyContent(file,new File(caseOffPath),true);
+       FileUtil.copyContent(new File(FilePath.OFFLINE_TEMPLATE_PATH),new File(caseOffPath),true);
 
        String s = FileUtil.readString(caseOffPath + File.separator + batName, StandardCharsets.UTF_8);
        String s1 = s.replaceAll("@caseId", String.valueOf(caseId));

src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -52,12 +52,14 @@ public class InitService {
 
     public void initConfig(){
         CacheUtil.uploadType = uploadType;
-        CacheUtil.installPath = installPath;
+        CacheUtil.installPath = new File(installPath).getParentFile().getPath() +File.separator;
+        log.info(installPath);
+        log.info(CacheUtil.installPath);
         String path = pathService.getBasePath();
         if(path != null){
             CacheUtil.basePath = path ;
         }else {
-            CacheUtil.basePath = installPath +"/4DKK_PROGRAM_STATIC/";
+            CacheUtil.basePath =  CacheUtil.installPath +"/4DKK_PROGRAM_STATIC/";
         }
     }
 

src/main/resources/application.yml

@@ -68,7 +68,7 @@ oss:
 
 
 fdkk:
-  installPath: ${DPROFILE_PATH}/../
+  installPath: ${DPROFILE_PATH}
 
 
 geoquery: