重构配置

pom.xml

@@ -39,20 +39,20 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-mongodb</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fdkankan</groupId>-->
+<!--            <artifactId>4dkankan-utils-mongodb</artifactId>-->
+<!--            <version>2.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
 
         <dependency>

src/main/java/com/fdkankan/gateway/config/NacosConfig.java

@@ -16,12 +16,12 @@ public class NacosConfig {
 
     public static String NACOS_ROUTE_GROUP;
 
-    @Value("${spring.cloud.nacos.config.server-addr}")
+    @Value("${spring.cloud.nacos.server-addr}")
     public void setNacosServerAddr(String nacosServerAddr){
         NACOS_SERVER_ADDR = nacosServerAddr;
     }
 
-    @Value("${spring.cloud.nacos.config.namespace}")
+    @Value("${spring.cloud.nacos.namespace}")
     public void setNacosNamespace(String nacosNamespace){
         NACOS_NAMESPACE = nacosNamespace;
     }

src/main/resources/bootstrap-dev.yml

@@ -3,10 +3,11 @@ spring:
     name: 4dkankan-gateway
   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-v4
+        namespace: ${spring.cloud.nacos.namespace}
         extension-configs:
           - data-id: 4dkankan-gateway.yaml
             group: DEFAULT_GROUP
@@ -16,14 +17,4 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-v4
-
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: '*'
-#  endpoint:
-#    health:
-#      show-details: ALWAYS
+        namespace: ${spring.cloud.nacos.namespace}

src/main/resources/bootstrap-test.yml

@@ -3,45 +3,14 @@ spring:
     name: 4dkankan-gateway
   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-test
-        extension-configs:
-          - data-id: 4dkankan-gateway.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+        namespace: ${spring.cloud.nacos.namespace}
         shared-configs:
-          - data-id: common-redis-config-52.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mongodb-config.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-        username: nacos
-        password: nacos
       discovery:
-        server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
-        username: nacos
-        password: nacos
-
-#management:
-#  endpoints:
-#    web:
-#      exposure:
-#        include: '*'
-#  endpoint:
-#    health:
-#      show-details: ALWAYS
-
-#nacos:
-#  gateway:
-#    route:
-#      config:
-#        data-id: 4dkankan-gateway-route
-server:
-  tomcat:
-    max-swallow-size: 2048
-#        group: DEFAULT_GROUP
+        namespace: ${spring.cloud.nacos.namespace}