From c5d68bb60fea07ec44c600e0a55990666ba33327 Mon Sep 17 00:00:00 2001 From: yuhuangbin Date: Mon, 14 Sep 2020 13:03:25 +0800 Subject: [PATCH] enhance --- .../nacos/discovery/NacosServiceDiscovery.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java index af39fce32..7d5d1858a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java @@ -38,13 +38,12 @@ public class NacosServiceDiscovery { private NacosDiscoveryProperties discoveryProperties; - private NamingService namingService; + private NacosServiceManager nacosServiceManager; public NacosServiceDiscovery(NacosDiscoveryProperties discoveryProperties, NacosServiceManager nacosServiceManager) { this.discoveryProperties = discoveryProperties; - this.namingService = nacosServiceManager - .getNamingService(discoveryProperties.getNacosProperties()); + this.nacosServiceManager = nacosServiceManager; } /** @@ -55,7 +54,7 @@ public class NacosServiceDiscovery { */ public List getInstances(String serviceId) throws NacosException { String group = discoveryProperties.getGroup(); - List instances = namingService.selectInstances(serviceId, group, true); + List instances = namingService().selectInstances(serviceId, group, true); return hostToServiceInstanceList(instances, serviceId); } @@ -66,7 +65,7 @@ public class NacosServiceDiscovery { */ public List getServices() throws NacosException { String group = discoveryProperties.getGroup(); - ListView services = namingService.getServicesOfServer(1, + ListView services = namingService().getServicesOfServer(1, Integer.MAX_VALUE, group); return services.getData(); } @@ -111,4 +110,8 @@ public class NacosServiceDiscovery { return nacosServiceInstance; } + private NamingService namingService() { + return nacosServiceManager.getNamingService(discoveryProperties.getNacosProperties()); + } + }