diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java index a3196e42..a65bd4f7 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfiguration.java @@ -37,6 +37,10 @@ public class GatewayRoutersConfiguration { public static String ROUTE_GROUP; + public static String USERNAME; + + public static String PASSWORD; + /** * 路由配置文件数据获取方式yml,nacos,database */ @@ -63,8 +67,15 @@ public class GatewayRoutersConfiguration { } @Value("${jeecg.route.config.data-type}") - public void setDataType(String dataType) { - DATA_TYPE = dataType; + public void setDataType(String dataType) { DATA_TYPE = dataType; } + + @Value("${spring.cloud.nacos.config.username}") + public void setUsername(String username) { + USERNAME = username; + } + @Value("${spring.cloud.nacos.config.password}") + public void setPassword(String password) { + PASSWORD = password; } @@ -79,6 +90,11 @@ public class GatewayRoutersConfiguration { } + /** + * 映射接口文档默认地址(通过9999端口直接访问) + * @param indexHtml + * @return + */ @Bean public RouterFunction indexRouter(@Value("classpath:/META-INF/resources/doc.html") final org.springframework.core.io.Resource indexHtml) { return route(GET("/"), request -> ok().contentType(MediaType.TEXT_HTML).syncBody(indexHtml)); diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java index e6cc048f..d3d3420d 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java @@ -299,6 +299,8 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware { Properties properties = new Properties(); properties.setProperty("serverAddr", GatewayRoutersConfiguration.SERVER_ADDR); properties.setProperty("namespace", GatewayRoutersConfiguration.NAMESPACE); + properties.setProperty("username",GatewayRoutersConfiguration.USERNAME); + properties.setProperty("password",GatewayRoutersConfiguration.PASSWORD); return configService = NacosFactory.createConfigService(properties); } catch (Exception e) { log.error("创建ConfigService异常", e);