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

Merge pull request #1724 from yuhuangbin/master

Browse Source 
[Enhancement] NacosDiscoveryClient always getNamingservice from Nacosmanager
This commit is contained in:
Mercy Ma 2020-09-14 14:43:20 +08:00 committed by GitHub
commit 51baa35139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
View File

@ -38,13 +38,12 @@ public class NacosServiceDiscovery {
private NacosDiscoveryProperties discoveryProperties; private NacosDiscoveryProperties discoveryProperties;
private NamingService namingService; private NacosServiceManager nacosServiceManager;
public NacosServiceDiscovery(NacosDiscoveryProperties discoveryProperties, public NacosServiceDiscovery(NacosDiscoveryProperties discoveryProperties,
NacosServiceManager nacosServiceManager) { NacosServiceManager nacosServiceManager) {
this.discoveryProperties = discoveryProperties; this.discoveryProperties = discoveryProperties;
this.namingService = nacosServiceManager this.nacosServiceManager = nacosServiceManager;
.getNamingService(discoveryProperties.getNacosProperties());
} }
/** /**
@ -55,7 +54,7 @@ public class NacosServiceDiscovery {
*/ */
public List<ServiceInstance> getInstances(String serviceId) throws NacosException { public List<ServiceInstance> getInstances(String serviceId) throws NacosException {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
List<Instance> instances = namingService.selectInstances(serviceId, group, true); List<Instance> instances = namingService().selectInstances(serviceId, group, true);
return hostToServiceInstanceList(instances, serviceId); return hostToServiceInstanceList(instances, serviceId);
} }
@ -66,7 +65,7 @@ public class NacosServiceDiscovery {
*/ */
public List<String> getServices() throws NacosException { public List<String> getServices() throws NacosException {
String group = discoveryProperties.getGroup(); String group = discoveryProperties.getGroup();
ListView<String> services = namingService.getServicesOfServer(1, ListView<String> services = namingService().getServicesOfServer(1,
Integer.MAX_VALUE, group); Integer.MAX_VALUE, group);
return services.getData(); return services.getData();
} }
@ -111,4 +110,8 @@ public class NacosServiceDiscovery {
return nacosServiceInstance; return nacosServiceInstance;
} }
private NamingService namingService() {
return nacosServiceManager.getNamingService(discoveryProperties.getNacosProperties());
}
} }