重构配置

src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -398,9 +398,6 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion());
         sceneProEditService.updateById(sceneProEditEntity);
         FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
-        if(FYunTypeEnum.AWS.code().equals(ossType)){
-            return ResultData.ok(ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
-        }
         return ResultData.ok(ossPrefixUrl+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
     }
 

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -942,14 +942,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(scenejson.getIntValue("buildImages") == 1){
                 log.info("下载vision.modeldata文件");
-                if(FYunTypeEnum.AWS.code().equals(this.ossType)){
-                    FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                        "vision.modeldata", target + File.separator + "extras" + File.separator);
-                }
-                if(FYunTypeEnum.OSS.code().equals(this.ossType)){
-                    FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                        "vision.modeldata", target + File.separator + "extras" + File.separator);
-                }
+                FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+                    "vision.modeldata", target + File.separator + "extras" + File.separator);
                 CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
                     target + File.separator + "extras" + File.separator + "vision.txt");
 
@@ -1414,28 +1408,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json", new String(sceneEdit.getWebFloor().getBytes(), "UTF-8"));
             //下载vision.modeldata，解压成vision.txt,并且删除vision.modeldata
             log.info("下载vision.modeldata文件");
-            if(FYunTypeEnum.AWS.code().equals(ossType)){
-                FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                    "vision.modeldata", target + File.separator + "extras" + File.separator);
-            }
-            if(FYunTypeEnum.OSS.code().equals(this.ossType)){
-                FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                    "vision.modeldata", target + File.separator + "extras" + File.separator);
-            }
+            FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+                "vision.modeldata", target + File.separator + "extras" + File.separator);
             CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
                 target + File.separator + "extras" + File.separator + "vision.txt");
             log.info("解压完成，删除vision.modeldata文件");
             FileUtils.deleteFile(target + File.separator + "extras" + File.separator + "vision.modeldata");
 
             log.info("下载vision2.modeldata文件");
-            if(FYunTypeEnum.OSS.code().equals(ossType)){
-                FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
-                    "vision2.modeldata", target + File.separator + "extras" + File.separator);
-            }
-            if(FYunTypeEnum.AWS.code().equals(ossType)){
-                FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
-                    "vision2.modeldata", target + File.separator + "extras" + File.separator);
-            }
+            FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
+                "vision2.modeldata", target + File.separator + "extras" + File.separator);
             CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision2.modeldata",
                 target + File.separator + "extras" + File.separator + "vision2.txt");
             log.info("解压完成，删除vision2.modeldata文件");

src/main/resources/bootstrap-dev.yml

@@ -3,20 +3,17 @@ spring:
     name: 4dkankan-center-scene-v3
   cloud:
     nacos:
+      server-addr: 120.24.144.164:8848
+      namespace: 4dkankan-v4-test
       config:
-        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-scene-v3.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
           - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config-52.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -24,16 +21,15 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-dev
+        namespace: ${spring.cloud.nacos.namespace}
 
 
 

src/main/resources/bootstrap-test.yml

@@ -3,14 +3,11 @@ spring:
     name: 4dkankan-center-scene-v3
   cloud:
     nacos:
+      server-addr: 172.20.1.63:8848
+      namespace: 4dkankan-v4-test
       config:
-        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-v4
-        extension-configs:
-          - data-id: 4dkankan-center-scene-v3.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
           - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
@@ -24,7 +21,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -32,8 +29,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-v4
+        namespace: ${spring.cloud.nacos.namespace}