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 8d45725a5..dada50fe7 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 @@ -60,7 +60,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) { @@ -89,9 +89,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/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;