study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

fixes #87.

Browse Source
This commit is contained in:
Nepxion 2018-11-03 19:37:46 +08:00
parent fe28674457
commit b9f3a374fb
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,7 @@
# Compiled class file # Compiled class file
*.class *.class
*.classpath
*.factorypath
# Log file # Log file
*.log *.log

6
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java
View File

@ -25,12 +25,12 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
import java.util.*; import java.util.*;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView; import com.alibaba.nacos.api.naming.pojo.ListView;
/** /**
* @author xiaojing * @author xiaojing
* @author renhaojun
*/ */
public class NacosDiscoveryClient implements DiscoveryClient { public class NacosDiscoveryClient implements DiscoveryClient {
@ -109,8 +109,4 @@ public class NacosDiscoveryClient implements DiscoveryClient {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
public NamingService getNamingService() {
return discoveryProperties.namingServiceInstance();
}
} }

9
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java
View File

@ -19,9 +19,7 @@ package org.springframework.cloud.alibaba.nacos.ribbon;
import com.netflix.client.config.IClientConfig; import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList; import com.netflix.loadbalancer.AbstractServerList;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -30,11 +28,12 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
/** /**
* @author xiaojing * @author xiaojing
* @author renhaojun
*/ */
public class NacosServerList extends AbstractServerList<NacosServer> { public class NacosServerList extends AbstractServerList<NacosServer> {
@Autowired @Autowired
private NacosDiscoveryClient discoveryClient; private NacosDiscoveryProperties discoveryProperties;
private String serviceId; private String serviceId;
@ -57,7 +56,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> {
private List<NacosServer> getServers() { private List<NacosServer> getServers() {
try { try {
List<Instance> instances = discoveryClient.getNamingService() List<Instance> instances = discoveryProperties.namingServiceInstance()
.getAllInstances(serviceId); .getAllInstances(serviceId);
return instancesToServerList(instances); return instancesToServerList(instances);
} }