dengsixing 11 ماه پیش
والد
کامیت
e243e0bb44

+ 7 - 2
src/main/java/com/fdkankan/gateway/config/DynamicRouteServiceImplByNacos.java

@@ -1,5 +1,6 @@
 package com.fdkankan.gateway.config;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.config.ConfigService;
@@ -88,8 +89,12 @@ public class DynamicRouteServiceImplByNacos {
             Properties properties = new Properties();
             properties.setProperty("serverAddr", NacosConfig.NACOS_SERVER_ADDR);
             properties.setProperty("namespace", NacosConfig.NACOS_NAMESPACE);
-            properties.setProperty("username", NacosConfig.NACOS_USER_NAME);
-            properties.setProperty("password", NacosConfig.NACOS_PASSWORD);
+            if(StrUtil.isNotEmpty(NacosConfig.NACOS_USER_NAME)){
+                properties.setProperty("username", NacosConfig.NACOS_USER_NAME);
+            }
+            if(StrUtil.isNotEmpty(NacosConfig.NACOS_PASSWORD)){
+                properties.setProperty("password", NacosConfig.NACOS_PASSWORD);
+            }
             return configService= NacosFactory.createConfigService(properties);
         } catch (Exception e) {
             log.error("初始化网关路由时发生错误",e);

+ 2 - 2
src/main/java/com/fdkankan/gateway/config/NacosConfig.java

@@ -30,12 +30,12 @@ public class NacosConfig {
         NACOS_NAMESPACE = nacosNamespace;
     }
 
-    @Value("${spring.cloud.nacos.username}")
+    @Value("${spring.cloud.nacos.username:#{null}}")
     public void setNacosUserName(String username){
         NACOS_USER_NAME = username;
     }
 
-    @Value("${spring.cloud.nacos.password}")
+    @Value("${spring.cloud.nacos.password:#{null}}")
     public void setNacosPassword(String password){
         NACOS_PASSWORD = password;
     }

+ 0 - 18
src/main/resources/bootstrap-dev.yml

@@ -1,18 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-gateway
-  cloud:
-    nacos:
-      server-addr: 113.90.147.118:8848
-      namespace: prod
-      config:
-        file-extension: yaml
-        namespace: ${spring.cloud.nacos.namespace}
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-      username: nacos
-      password: Nacos4Dage.

+ 0 - 18
src/main/resources/bootstrap-prod.yml

@@ -1,18 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-gateway
-  cloud:
-    nacos:
-      server-addr: 192.168.1.105:8848
-      namespace: prod
-      config:
-        file-extension: yaml
-        namespace: ${spring.cloud.nacos.namespace}
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-      username: nacos
-      password: Nacos4Dage.

+ 0 - 18
src/main/resources/bootstrap-test.yml

@@ -1,18 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-gateway
-  cloud:
-    nacos:
-      server-addr: 113.90.147.118:18469
-      namespace: prod
-      config:
-        file-extension: yaml
-        namespace: ${spring.cloud.nacos.namespace}
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-      username: nacos
-      password: Nacos4Dage.

+ 15 - 2
src/main/resources/bootstrap.yml

@@ -1,3 +1,16 @@
 spring:
-  profiles:
-    active: dev
+  application:
+    name: 4dkankan-gateway
+  cloud:
+    nacos:
+      server-addr: 113.90.147.118:8848
+      namespace: prod
+      config:
+        file-extension: yaml
+        namespace: ${spring.cloud.nacos.namespace}
+        shared-configs:
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        namespace: ${spring.cloud.nacos.namespace}