Merge branch 'feature-test-20221116' into release

src/main/resources/bootstrap-test-eur.yml

@@ -1,35 +1,32 @@
 spring:
-  jackson:
-    serialization:
-      #关闭jackson转换 实体属性空值校验
-      FAIL_ON_EMPTY_BEANS: false
   application:
     name: 4dkankan-center-scene-download
   cloud:
     nacos:
+      server-addr: 120.24.144.164:8848
+      namespace: 4dkankan-v4-test-eur
       config:
-        server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test-eur
-        extension-configs:
-          - data-id: 4dkankan-center-scene-download.yaml
+        namespace: ${spring.cloud.nacos.namespace}
+        shared-configs:
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-        shared-configs:
 
-          - data-id: common-redis-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-db-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test-eur
+        namespace: ${spring.cloud.nacos.namespace}
+
+
 
 

src/main/resources/bootstrap-test.yml

@@ -3,7 +3,7 @@ spring:
     name: 4dkankan-center-scene-download
   cloud:
     nacos:
-      server-addr: 172.20.1.63:8848
+      server-addr: 120.24.144.164:8848
       namespace: 4dkankan-v4-test
       config:
         file-extension: yaml
@@ -20,6 +20,10 @@ spring:
           - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         namespace: ${spring.cloud.nacos.namespace}