lyhzzz il y a 3 mois
Parent
commit
0522e4cd75

+ 1 - 1
src/main/java/com/fdkankan/fusion/config/CacheUtil.java

@@ -2,6 +2,6 @@ package com.fdkankan.fusion.config;
 
 public class CacheUtil {
     public static String uploadType;
-    public static String basePath ="/mnt";
+    public static String basePath ="/mnt/";
 
 }

+ 2 - 2
src/main/java/com/fdkankan/fusion/controller/DictFileController.java

@@ -104,7 +104,7 @@ public class DictFileController extends BaseController{
             foName =  parentFile.getName();
         }
 
-        String filePath = String.format(CacheUtil.basePath+"/" +OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId) ;
+        String filePath = String.format(CacheUtil.basePath+OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId) ;
         String ossPath = String.format(OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId +"/"+dictFileId +".zip") ;
         ShellUtil.yunDownload(sceneObjPath,filePath);
         ShellUtil.zip(dictFileId+".zip",filePath+"/"+foName);
@@ -146,7 +146,7 @@ public class DictFileController extends BaseController{
             throw new BusinessException(ResultCode.FILE_NOT_EXIST);
         }
         fileInfo.setSize(Long.valueOf(commonUpload.getFileSize()));
-        String filePath = String.format(CacheUtil.basePath+"/" +OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId) ;
+        String filePath = String.format(CacheUtil.basePath+OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId) ;
         String ossPath = String.format(OssPath.MANAGE_FILE_DOWN_PATH ,dictFileId +"/"+ dictFileId + "_hash.txt") ;
 
         File file = new File(filePath +"/"+dictFileId + "_hash.txt");

+ 1 - 1
src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -56,7 +56,7 @@ public class OsgbToB3dmConsumer {
             //commonUploadService.updateStatus(uploadId,0);
             ///mnt/manage/media-library/result/ea041f3237df46568f4e83e723e743d4
             String dir = String.format(OssPath.MANAGE_MODEL_FILE_PATH ,UUID.randomUUID().toString().replace("-",""));
-            sourcePath = CacheUtil.basePath +File.separator+ dir;
+            sourcePath = CacheUtil.basePath + dir;
 
             OBJToGLBUtil.OsgbToB3dm(localPath,sourcePath);
             String b3dmJsonPath =  FileWriterUtil.checkB3dmTileset(new File(sourcePath));

+ 2 - 2
src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -84,7 +84,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
 
             String ossPath = String.format(OssPath.MANAGE_MODEL_FILE_PATH, uuid + extName);
 
-            tempFile = new File(OssPath.localPath +File.separator+ ossPath);
+            tempFile = new File(OssPath.localPath + ossPath);
             if(!tempFile.getParentFile().exists()){
                 tempFile.getParentFile().mkdirs();
             }
@@ -116,7 +116,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
     private ResultData uploadModelZip(String oldName,File file,Integer dictId) {
 
         String ossZipPath = String.format(OssPath.MANAGE_MODEL_FILE_PATH, UUID.randomUUID().toString().replace("-", ""));
-        String unzipPath = CacheUtil.basePath +File.separator + ossZipPath;
+        String unzipPath = CacheUtil.basePath  + ossZipPath;
         ShellUtil.unZip(file.getPath(),unzipPath);
         try {
             Thread.sleep(1000L);