From 96b3ba6e9af16be2d378f0d71f4103e6c05b147d Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 18 Jul 2023 14:43:46 +0800 Subject: [PATCH] =?UTF-8?q?nacos=E6=94=AF=E6=8C=81=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E9=89=B4=E6=9D=83=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swagger/MySwaggerResourceProvider.java | 28 +++++++++++++++++-- .../org/jeecg/loader/DynamicRouteLoader.java | 2 ++ .../src/main/resources/application.yml | 6 ++++ .../src/main/resources/application.yml | 6 ++++ .../src/main/resources/application.yml | 6 ++++ pom.xml | 28 +++++++++++++++++-- 6 files changed, 72 insertions(+), 4 deletions(-) diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java index d4e81d76..babaf1e9 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java @@ -51,6 +51,23 @@ public class MySwaggerResourceProvider implements SwaggerResourcesProvider { @Value("${spring.cloud.nacos.discovery.namespace:#{null}}") private String namespace; + /** + * nacos groupName + */ + @Value("${spring.cloud.nacos.config.group:DEFAULT_GROUP:#{null}}") + private String group; + + /** + * nacos username + */ + @Value("${spring.cloud.nacos.discovery.username:#{null}}") + private String username; + /** + * nacos password + */ + @Value("${spring.cloud.nacos.discovery.password:#{null}}") + private String password; + /** * Swagger中需要排除的服务 */ @@ -117,14 +134,21 @@ public class MySwaggerResourceProvider implements SwaggerResourcesProvider { Properties properties=new Properties(); properties.setProperty("serverAddr",serverAddr); if(namespace!=null && !"".equals(namespace)){ + log.info("nacos.discovery.namespace = {}", namespace); properties.setProperty("namespace",namespace); } + if(username!=null && !"".equals(username)){ + properties.setProperty("username",username); + } + if(password!=null && !"".equals(password)){ + properties.setProperty("password",password); + } //【issues/5115】因swagger文档导致gateway内存溢出 if (this.naming == null) { this.naming = NamingFactory.createNamingService(properties); } - - List list = this.naming.selectInstances(routeId, true); + log.info(" config.group : {}", group); + List list = this.naming.selectInstances(routeId, group , true); if (ObjectUtil.isNotEmpty(list)) { hasRoute = true; } diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java index f42eeb1f..0537ba70 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java @@ -117,6 +117,8 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware { log.warn("initConfigService fail"); } try { + log.info("jeecg.route.config.data-id = {}", gatewayRoutersConfig.getDataId()); + log.info("nacos.config.group = {}", gatewayRoutersConfig.getRouteGroup()); String configInfo = configService.getConfig(gatewayRoutersConfig.getDataId(), gatewayRoutersConfig.getRouteGroup(), DEFAULT_TIMEOUT); if (StringUtils.isNotBlank(configInfo)) { log.info("获取网关当前配置:\r\n{}", configInfo); diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml index 7e3cbb2a..6a1c4922 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml @@ -15,8 +15,14 @@ spring: server-addr: @config.server-addr@ group: @config.group@ namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ discovery: server-addr: ${spring.cloud.nacos.config.server-addr} + group: @config.group@ + namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ gateway: discovery: locator: diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml index 87c06050..8a940949 100644 --- a/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml @@ -10,8 +10,14 @@ spring: server-addr: @config.server-addr@ group: @config.group@ namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ discovery: server-addr: ${spring.cloud.nacos.config.server-addr} + group: @config.group@ + namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ config: import: - optional:nacos:jeecg.yaml diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml index 7842d376..53f5eed6 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml @@ -10,8 +10,14 @@ spring: server-addr: @config.server-addr@ group: @config.group@ namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ discovery: server-addr: ${spring.cloud.nacos.config.server-addr} + group: @config.group@ + namespace: @config.namespace@ + username: @config.username@ + password: @config.password@ config: import: - optional:nacos:jeecg.yaml diff --git a/pom.xml b/pom.xml index dfa54bac..53e7357b 100644 --- a/pom.xml +++ b/pom.xml @@ -432,8 +432,24 @@ DEFAULT_GROUP + + + + + test @@ -446,8 +462,12 @@ DEFAULT_GROUP - - + + + + + + prod @@ -460,6 +480,10 @@ DEFAULT_GROUP + + + +