From f31b48a01f08563a918bab143ec63e111ac830a1 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 6 Nov 2019 17:10:53 +0800 Subject: [PATCH] sync & commit in greenwich --- .../DubboServiceDiscoveryAutoConfiguration.java | 10 +++++++--- .../cloud/seata/web/SeataHandlerInterceptor.java | 2 ++ 2 files changed, 9 insertions(+), 3 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 82b8805d..d14f6255 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 @@ -508,14 +508,17 @@ public class DubboServiceDiscoveryAutoConfiguration { class NacosConfiguration { private final NamingService namingService; + private final NacosDiscoveryProperties nacosDiscoveryProperties; /** - * the set of services is listening + * 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<>(); } @@ -541,7 +544,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( diff --git a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java index cc37590b..8bccf216 100644 --- a/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java +++ b/spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java @@ -23,6 +23,7 @@ import io.seata.core.context.RootContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerInterceptor; @@ -35,6 +36,7 @@ import org.springframework.web.servlet.HandlerInterceptor; * And clean up Seata information after servlet method invocation in * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)} */ +@ConditionalOnWebApplication public class SeataHandlerInterceptor implements HandlerInterceptor { private static final Logger log = LoggerFactory