update nacos discovery logic, support both health and enabled

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<ServiceInstance> getInstances(String serviceId) {
 		try {
 			List<Instance> 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<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;
 	}

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);

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;