diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java index 519b25120..d7707584c 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java @@ -48,7 +48,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { public List getInstances(String serviceId) { try { List instances = discoveryProperties.namingServiceInstance() - .getAllInstances(serviceId); + .selectInstances(serviceId, true); return hostToServiceInstanceList(instances, serviceId); } catch (Exception e) { @@ -77,9 +77,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { List instances, String serviceId) { List result = new ArrayList(instances.size()); for (Instance instance : instances) { - if (instance.isHealthy()) { - result.add(hostToServiceInstance(instance, serviceId)); - } + result.add(hostToServiceInstance(instance, serviceId)); } return result; } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java index 20a16433b..c4d7e0e3a 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java @@ -306,15 +306,15 @@ public class NacosDiscoveryProperties { this.secretKey = secretKey; } - public String getNamingLoadCacheAtStart() { - return namingLoadCacheAtStart; - } + public String getNamingLoadCacheAtStart() { + return namingLoadCacheAtStart; + } - public void setNamingLoadCacheAtStart(String namingLoadCacheAtStart) { - this.namingLoadCacheAtStart = namingLoadCacheAtStart; - } + public void setNamingLoadCacheAtStart(String namingLoadCacheAtStart) { + this.namingLoadCacheAtStart = namingLoadCacheAtStart; + } - @Override + @Override public String toString() { return "NacosDiscoveryProperties{" + "serverAddr='" + serverAddr + '\'' + ", endpoint='" + endpoint + '\'' + ", namespace='" + namespace + '\'' @@ -323,7 +323,8 @@ public class NacosDiscoveryProperties { + ", metadata=" + metadata + ", registerEnabled=" + registerEnabled + ", ip='" + ip + '\'' + ", networkInterface='" + networkInterface + '\'' + ", port=" + port + ", secure=" + secure + ", accessKey='" + accessKey - + ", namingLoadCacheAtStart=" + namingLoadCacheAtStart + '\'' + ", secretKey='" + secretKey + '\'' + '}'; + + ", namingLoadCacheAtStart=" + namingLoadCacheAtStart + '\'' + + ", secretKey='" + secretKey + '\'' + '}'; } public void overrideFromEnv(Environment env) { @@ -372,7 +373,7 @@ public class NacosDiscoveryProperties { properties.put(ACCESS_KEY, accessKey); properties.put(SECRET_KEY, secretKey); properties.put(CLUSTER_NAME, clusterName); - properties.put(NAMING_LOAD_CACHE_AT_START,namingLoadCacheAtStart); + properties.put(NAMING_LOAD_CACHE_AT_START, namingLoadCacheAtStart); try { namingService = NacosFactory.createNamingService(properties); 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 ac33d6fd3..74dda2dec 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 @@ -57,7 +57,7 @@ public class NacosServerList extends AbstractServerList { private List getServers() { try { List instances = discoveryProperties.namingServiceInstance() - .getAllInstances(serviceId); + .selectInstances(serviceId, true); return instancesToServerList(instances); } catch (Exception e) { @@ -70,9 +70,7 @@ public class NacosServerList extends AbstractServerList { private List instancesToServerList(List instances) { List result = new ArrayList<>(instances.size()); for (Instance instance : instances) { - if (instance.isHealthy()) { - result.add(new NacosServer(instance)); - } + result.add(new NacosServer(instance)); } return result;