lyhzzz 1 年之前
父節點
當前提交
9534e1d4f9

+ 1 - 1
src/main/java/com/fdkankan/fusion/common/util/ShellCmd.java

@@ -10,6 +10,6 @@ public class ShellCmd {
 	public static final String FYUN_UPLOAD = "bash /opt/ossutil/fyun-upload.sh %s %s /%s %s %s";
 	public static final String FYUN_DOWN = "bash /opt/ossutil/fyun-download.sh %s /%s %s %s %s";
 
-	public static final String osgbTob3dmCmd = "bash /mnt/fusion/3dtile.sh -f osgb -i " +
+	public static final String osgbTob3dmCmd = "sudo docker run --rm -v /mnt/fusion:/mnt/fusion 3dtile:v2 /mnt/fusion/3dtile.sh -f osgb -i " +
 			"@inputFile -o @outputFile";
 }

+ 1 - 4
src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -120,7 +120,6 @@ public class CaseDownService {
                     ResultData.ok(caseVideoService.getAllList(videoFolder.getVideoFolderId())));
         }
 
-
         jsonObject.put(basePath+caseFiles+caseId,
                 ResultData.ok(caseFilesService.allList(caseId,null)));
 
@@ -138,7 +137,6 @@ public class CaseDownService {
                     ResultData.ok(caseTagPointService.allList(tag.getTagId())));
         }
 
-
         List<FusionGuide> fusionGuides = fusionGuideService.getAllList(caseId);
         jsonObject.put(basePath+fusionGuide+caseId,
                 ResultData.ok(fusionGuides));
@@ -154,8 +152,7 @@ public class CaseDownService {
         jsonObject.put(basePath+caseExtractDetail+caseId,
                 ResultData.ok(caseExtractDetailService.getByCaseId(caseId)));
 
-
-        FileUtil.writeString(JSON.toJSONString(jsonObject), String.format(FilePath.OFFLINE_PACKAGE_PATH,caseId)+ File.separator+jsonDataName,"utf-8");
+        FileUtil.writeString(JSON.toJSONString(jsonObject), String.format(FilePath.OFFLINE_PACKAGE_PATH,caseId)+ File.separator+jsonDataName,"UTF-8");
 
     }
 }