diff --git a/spring-cloud-alibaba-nacos-discovery/pom.xml b/spring-cloud-alibaba-nacos-discovery/pom.xml index 537d4da52..3b5717302 100644 --- a/spring-cloud-alibaba-nacos-discovery/pom.xml +++ b/spring-cloud-alibaba-nacos-discovery/pom.xml @@ -29,11 +29,6 @@ spring-cloud-commons - - org.springframework.boot - spring-boot-starter-web - - org.springframework.cloud spring-cloud-starter-netflix-ribbon @@ -62,7 +57,12 @@ provided true - + + com.fasterxml.jackson.core + jackson-annotations + provided + true + org.springframework.boot spring-boot-autoconfigure @@ -70,6 +70,11 @@ true + + org.springframework.boot + spring-boot-starter-web + test + org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java index 9b41d2aa4..e3d1f7322 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java @@ -33,7 +33,8 @@ public class NacosRibbonClientConfiguration { @Bean @ConditionalOnMissingBean public ServerList ribbonServerList(IClientConfig config) { - NacosServerList serverList = new NacosServerList(config.getClientName()); + NacosServerList serverList = new NacosServerList(); + serverList.initWithNiwsConfig(config); return serverList; } } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java index 540e71363..f766945fb 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java @@ -36,6 +36,7 @@ public class NacosServerList extends AbstractServerList { private String serviceId; + public NacosServerList(){} public NacosServerList(String serviceId) { this.serviceId = serviceId;