From bee06af41cf074a4def7c7d467e184ebbc86b1dc Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 4 Dec 2018 15:07:01 +0800
Subject: [PATCH] update nacos discovery logic, support both health and enabled

---
 .../cloud/alibaba/nacos/NacosDiscoveryClient.java           | 6 ++----
 .../cloud/alibaba/nacos/ribbon/NacosServerList.java         | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

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 8d45725a..dada50fe 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<ServiceInstance> getInstances(String serviceId) {
 		try {
 			List<Instance> 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<Instance> instances, String serviceId) {
 		List<ServiceInstance> result = new ArrayList<ServiceInstance>(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 ac33d6fd..74dda2de 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<NacosServer> {
 	private List<NacosServer> getServers() {
 		try {
 			List<Instance> instances = discoveryProperties.namingServiceInstance()
-					.getAllInstances(serviceId);
+					.selectInstances(serviceId, true);
 			return instancesToServerList(instances);
 		}
 		catch (Exception e) {
@@ -70,9 +70,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
 	private List<NacosServer> instancesToServerList(List<Instance> instances) {
 		List<NacosServer> result = new ArrayList<>(instances.size());
 		for (Instance instance : instances) {
-			if (instance.isHealthy()) {
-				result.add(new NacosServer(instance));
-			}
+			result.add(new NacosServer(instance));
 		}
 
 		return result;