Merge pull request #2 from alibaba/master

update

README-zh.md

@@ -70,7 +70,7 @@ Spring Cloud 使用 Maven 来构建，最快的使用方式是将本项目 clone
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.0.RELEASE</version>
+                <version>2.2.2.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

README.md

@@ -45,7 +45,7 @@ For more features, please refer to [Roadmap](https://github.com/alibaba/spring-c
 
 **[Alibaba Cloud SMS](https://www.aliyun.com/product/sms)**: A messaging service that covers the globe, Alibaba SMS provides convenient, efficient, and intelligent communication capabilities that help businesses quickly contact their customers.
 
-**[Alibaba Cloud SchedulerX](https://www.aliyun.com/product/SchedulerX)**:accurate, highly reliable, and highly available scheduled job scheduling services with response time within seconds..
+**[Alibaba Cloud SchedulerX](https://www.aliyun.com/aliware/schedulerx?spm=5176.10695662.784137.1.4b07363dej23L3)**:accurate, highly reliable, and highly available scheduled job scheduling services with response time within seconds..
 
 For more features please refer to [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap.md).
 
@@ -71,7 +71,7 @@ These artifacts are available from Maven Central and Spring Release repository v
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.1.RELEASE</version>
+                <version>2.2.2.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

pom.xml

@@ -80,7 +80,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2.2.2-SNAPSHOT</revision>
+        <revision>2.2.2.RELEASE</revision>
 
         <!-- Dependency Versions -->
         <spring-cloud-commons.version>2.2.5.RELEASE</spring-cloud-commons.version>

spring-cloud-alibaba-dependencies/pom.xml

@@ -18,7 +18,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2.2.2-SNAPSHOT</revision>
+        <revision>2.2.2.RELEASE</revision>
         <sentinel.version>1.8.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <seata.version>1.3.0</seata.version>

spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc

@@ -10,7 +10,7 @@ Spring Cloud Alibaba BOM 包含了它所使用的所有依赖的版本。
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>2.2.2.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc

@@ -8,7 +8,7 @@ If you’re a Maven Central user, add our BOM to your pom.xml <dependencyManagem
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>2.2.2.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderApplication.java

@@ -25,10 +25,10 @@ import org.springframework.web.client.RestTemplate;
  * @author xiaojing
  */
 @SpringBootApplication
-public class OderApplication {
+public class OrderApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(OderApplication.class, args);
+		SpringApplication.run(OrderApplication.class, args);
 	}
 
 	@Bean

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java

@@ -18,8 +18,8 @@ package com.alibaba.cloud.nacos.discovery;
 
 import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosServiceManager;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -31,7 +31,6 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.TaskScheduler;
 
 /**
  * @author xiaojing
@@ -56,9 +55,9 @@ public class NacosDiscoveryClientConfiguration {
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled",
 			matchIfMissing = true)
-	public NacosWatch nacosWatch(NacosDiscoveryProperties nacosDiscoveryProperties,
+	public NacosWatch nacosWatch(NacosServiceManager nacosServiceManager,
-			ObjectProvider<TaskScheduler> taskScheduler) {
+			NacosDiscoveryProperties nacosDiscoveryProperties) {
-		return new NacosWatch(nacosDiscoveryProperties, taskScheduler);
+		return new NacosWatch(nacosServiceManager, nacosDiscoveryProperties);
 	}
 
 }

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java

@@ -16,67 +16,54 @@
 
 package com.alibaba.cloud.nacos.discovery;
 
-import java.util.concurrent.ScheduledFuture;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosServiceManager;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.listener.Event;
+import com.alibaba.nacos.api.naming.listener.EventListener;
+import com.alibaba.nacos.api.naming.listener.NamingEvent;
+import com.alibaba.nacos.api.naming.pojo.Instance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.SmartLifecycle;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 /**
  * @author xiaojing
+ * @author yuhuangbin
  */
 public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycle {
 
 	private static final Logger log = LoggerFactory.getLogger(NacosWatch.class);
 
-	private final NacosDiscoveryProperties properties;
+	private Map<String, EventListener> listenerMap = new ConcurrentHashMap<>(16);
-
-	private final TaskScheduler taskScheduler;
-
-	private final AtomicLong nacosWatchIndex = new AtomicLong(0);
 
 	private final AtomicBoolean running = new AtomicBoolean(false);
 
+	private final AtomicLong nacosWatchIndex = new AtomicLong(0);
+
 	private ApplicationEventPublisher publisher;
 
-	private ScheduledFuture<?> watchFuture;
+	private NacosServiceManager nacosServiceManager;
 
-	public NacosWatch(NacosDiscoveryProperties properties) {
+	private final NacosDiscoveryProperties properties;
-		this(properties, getTaskScheduler());
-	}
 
-	public NacosWatch(NacosDiscoveryProperties properties, TaskScheduler taskScheduler) {
+	public NacosWatch(NacosServiceManager nacosServiceManager,
+			NacosDiscoveryProperties properties) {
+		this.nacosServiceManager = nacosServiceManager;
 		this.properties = properties;
-		this.taskScheduler = taskScheduler;
-	}
-
-	/**
-	 * The constructor with {@link NacosDiscoveryProperties} bean and the optional.
-	 * {@link TaskScheduler} bean
-	 * @param properties {@link NacosDiscoveryProperties} bean
-	 * @param taskScheduler the optional {@link TaskScheduler} bean
-	 * @since 2.2.0
-	 */
-	public NacosWatch(NacosDiscoveryProperties properties,
-			ObjectProvider<TaskScheduler> taskScheduler) {
-		this(properties, taskScheduler.getIfAvailable(NacosWatch::getTaskScheduler));
-	}
-
-	private static ThreadPoolTaskScheduler getTaskScheduler() {
-		ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
-		taskScheduler.setBeanName("Nacos-Watch-Task-Scheduler");
-		taskScheduler.initialize();
-		return taskScheduler;
 	}
 
 	@Override
@@ -98,19 +85,67 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
 	@Override
 	public void start() {
 		if (this.running.compareAndSet(false, true)) {
-			this.watchFuture = this.taskScheduler.scheduleWithFixedDelay(
+			EventListener eventListener = listenerMap.computeIfAbsent(buildKey(),
-					this::nacosServicesWatch, this.properties.getWatchDelay());
+					event -> new EventListener() {
+						@Override
+						public void onEvent(Event event) {
+							if (event instanceof NamingEvent) {
+								List<Instance> instances = ((NamingEvent) event)
+										.getInstances();
+								Optional<Instance> instanceOptional = selectCurrentInstance(
+										instances);
+								instanceOptional.ifPresent(currentInstance -> {
+									resetIfNeeded(currentInstance);
+								});
+								publisher.publishEvent(new HeartbeatEvent(NacosWatch.this,
+										nacosWatchIndex.getAndIncrement()));
+							}
+						}
+					});
+
+			NamingService namingService = nacosServiceManager
+					.getNamingService(properties.getNacosProperties());
+			try {
+				namingService.subscribe(properties.getService(), properties.getGroup(),
+						Arrays.asList(properties.getClusterName()), eventListener);
+			}
+			catch (Exception e) {
+				log.error("namingService subscribe failed, properties:{}", properties, e);
+			}
 		}
 	}
 
+	private String buildKey() {
+		return String.join(":", properties.getService(), properties.getGroup());
+	}
+
+	private void resetIfNeeded(Instance instance) {
+		if (!properties.getMetadata().equals(instance.getMetadata())) {
+			properties.setMetadata(instance.getMetadata());
+		}
+	}
+
+	private Optional<Instance> selectCurrentInstance(List<Instance> instances) {
+		return instances.stream()
+				.filter(instance -> properties.getIp().equals(instance.getIp())
+						&& properties.getPort() == instance.getPort())
+				.findFirst();
+	}
+
 	@Override
 	public void stop() {
-		if (this.running.compareAndSet(true, false) && this.watchFuture != null) {
+		if (this.running.compareAndSet(true, false)) {
-			// shutdown current user-thread,
+			EventListener eventListener = listenerMap.get(buildKey());
-			// then the other daemon-threads will terminate automatic.
+			NamingService namingService = nacosServiceManager
-			((ThreadPoolTaskScheduler) this.taskScheduler).shutdown();
+					.getNamingService(properties.getNacosProperties());
-
+			try {
-			this.watchFuture.cancel(true);
+				namingService.unsubscribe(properties.getService(), properties.getGroup(),
+						Arrays.asList(properties.getClusterName()), eventListener);
+			}
+			catch (NacosException e) {
+				log.error("namingService unsubscribe failed, properties:{}", properties,
+						e);
+			}
 		}
 	}
 
@@ -124,12 +159,4 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
 		return 0;
 	}
 
-	public void nacosServicesWatch() {
-
-		// nacos doesn't support watch now , publish an event every 30 seconds.
-		this.publisher.publishEvent(
-				new HeartbeatEvent(this, nacosWatchIndex.getAndIncrement()));
-
-	}
-
 }

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java

@@ -41,45 +41,46 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 			.getLogger(SeataHandlerInterceptor.class);
 
 	@Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
-        String xid = RootContext.getXID();
+			Object handler) {
-        String rpcXid = request.getHeader(RootContext.KEY_XID);
+		String xid = RootContext.getXID();
-        if (log.isDebugEnabled()) {
+		String rpcXid = request.getHeader(RootContext.KEY_XID);
-            log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid);
+		if (log.isDebugEnabled()) {
-        }
+			log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid);
+		}
 
-        if (StringUtils.isBlank(xid) && rpcXid != null) {
+		if (StringUtils.isBlank(xid) && rpcXid != null) {
-            RootContext.bind(rpcXid);
+			RootContext.bind(rpcXid);
-            if (log.isDebugEnabled()) {
+			if (log.isDebugEnabled()) {
-                log.debug("bind {} to RootContext", rpcXid);
+				log.debug("bind {} to RootContext", rpcXid);
-            }
+			}
-        }
+		}
 
-        return true;
+		return true;
-    }
+	}
 
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
+			Object handler, Exception e) {
+		if (StringUtils.isNotBlank(RootContext.getXID())) {
+			String rpcXid = request.getHeader(RootContext.KEY_XID);
 
-    @Override
+			if (StringUtils.isEmpty(rpcXid)) {
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception e) {
+				return;
-        if (StringUtils.isNotBlank(RootContext.getXID())) {
+			}
-            String rpcXid = request.getHeader(RootContext.KEY_XID);
 
-            if (StringUtils.isEmpty(rpcXid)) {
+			String unbindXid = RootContext.unbind();
-                return;
+			if (log.isDebugEnabled()) {
-            }
+				log.debug("unbind {} from RootContext", unbindXid);
-
+			}
-            String unbindXid = RootContext.unbind();
+			if (!rpcXid.equalsIgnoreCase(unbindXid)) {
-            if (log.isDebugEnabled()) {
+				log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
-                log.debug("unbind {} from RootContext", unbindXid);
+				if (unbindXid != null) {
-            }
+					RootContext.bind(unbindXid);
-            if (!rpcXid.equalsIgnoreCase(unbindXid)) {
+					log.warn("bind {} back to RootContext", unbindXid);
-                log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
+				}
-                if (unbindXid != null) {
+			}
-                    RootContext.bind(unbindXid);
+		}
-                    log.warn("bind {} back to RootContext", unbindXid);
+	}
-                }
-            }
-        }
-    }
 
 }