Merge branch 'release' into project-jp

# Conflicts:
#	src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -238,12 +238,6 @@ public class RabbitMqListener {
             return ModelingBuildStatus.SUCCESS;
         }
 
-        /*
-         1、判断是否计算过资源，若计算过删除缓存, 如果caches中存在_images文件或者目录，就删除掉，否则就删除除了images以外的所有文件和目录
-         2、删除上一次计算出来的result目录
-         */
-        this.deleteCachesAndResult(path,message);
-
         Map<String, String> dataMap = buildService.getTypeString(cameraType, algorithm, resolution,dataJson);
 
         String splitType = dataMap.get("splitType");
@@ -355,22 +349,4 @@ public class RabbitMqListener {
         buildResult.setBuildContext(message.getBuildContext());
         rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),buildResult);
     }
-
-    private void deleteCachesAndResult(String path,BuildSceneCallMessage message){
-        //判断是否计算过资源，若计算过删除缓存, 如果caches中存在_images文件或者目录，就删除掉，否则就删除除了images以外的所有文件和目录
-        File caches = new File(path + File.separator + "caches");
-        if (caches.exists()) {
-            FileUtils.deleteDirectory(path + File.separator + "caches");
-        }
-        //删除上一次计算出来的result目录
-        if (new File(path + File.separator + "results").exists()) {
-            FileUtils.delAllFile(path + File.separator + "results");
-        }
-        //删除点位数据
-        if (!ObjectUtils.isEmpty(message.getExt()) && message.getExt().containsKey("deleteExtras") && (Boolean) message.getExt().get("deleteExtras")
-                && new File(path + File.separator + "extras").exists()) {
-            FileUtils.delAllFile(path + File.separator + "extras");
-        }
-    }
-
 }

src/main/resources/bootstrap-dev.yml

@@ -4,49 +4,33 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.0.47:8848
+        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-v4-test
         extension-configs:
           - data-id: 4dkankan-center-modeling.yaml
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config.yaml
+          - data-id: rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
-          - data-id: rabbitmq-config.yaml
+          - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-scaling.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: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-        metadata:
-          management:
-            context-path: ${server.servlet.context-path}/actuator
-
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: '*'
-#  endpoint:
-#    health:
-#      show-details: ALWAYS
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}

src/main/resources/bootstrap-local.yml

@@ -31,12 +31,6 @@ spring:
           - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: '*'
-#  endpoint:
-#    health:
-#      show-details: ALWAYS
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}