lyhzzz 2 kuukautta sitten
vanhempi
commit
47faaa7453

+ 3 - 0
src/main/java/com/fdkankan/fusion/FusionApplication.java

@@ -22,6 +22,8 @@ public class FusionApplication  implements CommandLineRunner {
     private String uploadType;
     @Value("${upload.query-path}")
     private String queryPath;
+    @Value("${spring.profiles.active}")
+    private String environment;
     public static void main(String[] args) {
         SpringApplication.run(FusionApplication.class, args);
     }
@@ -30,6 +32,7 @@ public class FusionApplication  implements CommandLineRunner {
     public void run(String... args) throws Exception {
         CacheUtil.uploadType = uploadType;
         CacheUtil.queryPath = queryPath;
+        CacheUtil.environment = environment;
 
     }
 }

+ 3 - 3
src/main/java/com/fdkankan/fusion/common/OssPath.java

@@ -5,10 +5,10 @@ import com.fdkankan.fusion.config.CacheUtil;
 public class OssPath {
 
     public final static String localPath = CacheUtil.basePath;
-    public final static String MANAGE_FILE_PATH = "fusion/media-library/file/%s";
-    public final static String MANAGE_MODEL_FILE_PATH = "fusion/media-library/model/%s";
+    public final static String MANAGE_FILE_PATH = "fusion/"+CacheUtil.environment+"/media-library/file/%s";
+    public final static String MANAGE_MODEL_FILE_PATH = "fusion/"+CacheUtil.environment+"/media-library/model/%s";
 
-    public final static String MANAGE_FILE_DOWN_PATH = "fusion/media-library/down/%s";
+    public final static String MANAGE_FILE_DOWN_PATH = "fusion/"+CacheUtil.environment+"/media-library/down/%s";
 
 
 }

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

@@ -4,6 +4,7 @@ public class CacheUtil {
     public static String uploadType;
     public static String queryPath;
     public static String basePath ="/mnt/";
+    public static String environment;
 
 
 }

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

@@ -505,7 +505,7 @@ public class CaseDownService {
             String res = (String) object;
             log.info("下载模型:{}",res);
             res = res.replace(queryPath, "");
-            if(res.contains(".json") || res.contains(".shp") || res.contains(".obj")){
+            if(res.contains(".json")  || res.contains(".obj")){
                 res = new File(res).getParentFile().getPath();
             }
             String desPath = path + "/oss/" + res;