From b2825b275f8d77096dfd04c1426fcfeed264b66d Mon Sep 17 00:00:00 2001 From: tyq0010 <840667455@qq.com> Date: Tue, 5 Nov 2019 21:31:39 +0800 Subject: [PATCH] Update DubboServiceDiscoveryAutoConfiguration.java fix (DubboServiceDiscoveryAutoConfiguration does not set the group when subscribing to service #1043) --- .../DubboServiceDiscoveryAutoConfiguration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java index b9ee12be9..e20fc2c00 100644 --- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java @@ -505,14 +505,16 @@ public class DubboServiceDiscoveryAutoConfiguration { class NacosConfiguration { private final NamingService namingService; + private final NacosDiscoveryProperties nacosDiscoveryProperties; /** * the set of services is listening. */ private final Set listeningServices; - NacosConfiguration(NacosNamingManager nacosNamingManager) { + NacosConfiguration(NacosNamingManager nacosNamingManager, NacosDiscoveryProperties nacosDiscoveryProperties) { this.namingService = nacosNamingManager.getNamingService(); + this.nacosDiscoveryProperties = nacosDiscoveryProperties; this.listeningServices = new ConcurrentSkipListSet<>(); } @@ -537,7 +539,8 @@ public class DubboServiceDiscoveryAutoConfiguration { private void subscribeEventListener(String serviceName) { if (listeningServices.add(serviceName)) { try { - namingService.subscribe(serviceName, event -> { + String group = nacosDiscoveryProperties.getGroup(); + namingService.subscribe(serviceName, group, event -> { if (event instanceof NamingEvent) { NamingEvent namingEvent = (NamingEvent) event; List serviceInstances = hostToServiceInstanceList(