Merge pull request #1972 from alibaba/master

merge 2.2.5.RELEASE to 2020.0.0
alibaba · Feb 20, 2021 · a40b44a · a40b44a
2 parents fe00047 + 41e6529
commit a40b44a
Show file tree

Hide file tree

Showing 39 changed files with 1,449 additions and 102 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -19,7 +19,7 @@ Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。
 * **服务注册与发现**：适配 Spring Cloud 服务注册与发现标准，默认集成了 Ribbon 的支持。
 * **分布式配置管理**：支持分布式系统中的外部化配置，配置更改时自动刷新。
 * **消息驱动能力**：基于 Spring Cloud Stream 为微服务应用构建消息驱动能力。
-* **分布式事务**：使用 @GlobalTransactional 注解， 高效并且对业务零侵入地解决分布式事务问题。。
+* **分布式事务**：使用 @GlobalTransactional 注解， 高效并且对业务零侵入地解决分布式事务问题。
 * **阿里云对象存储**：阿里云提供的海量、安全、低成本、高可靠的云存储服务。支持在任何应用、任何时间、任何地点存储和访问任意类型的数据。
 * **分布式任务调度**：提供秒级、精准、高可靠、高可用的定时（基于 Cron 表达式）任务调度服务。同时提供分布式的任务执行模型，如网格任务。网格任务支持海量子任务均匀分配到所有 Worker（schedulerx-client）上执行。
 * **阿里云短信服务**：覆盖全球的短信服务，友好、高效、智能的互联化通讯能力，帮助企业迅速搭建客户触达通道。
@@ -70,7 +70,7 @@ Spring Cloud 使用 Maven 来构建，最快的使用方式是将本项目 clone
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.3.RELEASE</version>
+                <version>2.2.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ With Spring Cloud Alibaba, you only need to add some annotations and a small amo
 
 For more features, please refer to [Roadmap](https://github.com/alibaba/spring-cloud-alibaba/blob/master/Roadmap.md).
 
+
 ## Components
 
 **[Sentinel](https://github.com/alibaba/Sentinel)**: Sentinel takes "traffic flow" as the breakthrough point, and provides solutions in areas such as flow control, concurrency, circuit breaking, and load protection to protect service stability.
@@ -71,7 +72,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.3.RELEASE</version>
+                <version>2.2.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2.2.4-SNAPSHOT</revision>
+        <revision>2.2.5.RC2</revision>
 
         <!-- Dependency Versions -->
         <spring-cloud-commons.version>2.2.5.RELEASE</spring-cloud-commons.version>

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,10 +18,10 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2.2.4-SNAPSHOT</revision>
+        <revision>2.2.5.RC2</revision>
         <sentinel.version>1.8.0</sentinel.version>
         <seata.version>1.3.0</seata.version>
-        <nacos.client.version>1.4.0</nacos.client.version>
+        <nacos.client.version>1.4.1</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <spring.context.support.version>1.0.10</spring.context.support.version>
 
@@ -245,6 +245,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-commons</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!-- Dubbo -->
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>

diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc b/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.3.RELEASE</version>
+            <version>2.2.4.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc b/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.3.RELEASE</version>
+            <version>2.2.4.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

diff --git a/...os-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/...os-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
@@ -161,29 +161,16 @@ public String toString() {
 @Component
 class SampleRunner implements ApplicationRunner {
 
-	@Value("${user.name:zz}")
-	String userName;
-
-	@Value("${user.age:25}")
-	int userAge;
-
 	@Autowired
 	private NacosConfigManager nacosConfigManager;
 
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
-		System.out.println(
-				String.format("Initial username=%s, userAge=%d", userName, userAge));
-
 		nacosConfigManager.getConfigService().addListener(
-				"nacos-config-example.properties", "DEFAULT_GROUP", new Listener() {
+				"nacos-config-custom.properties", "DEFAULT_GROUP", new Listener() {
 
 					/**
 					 * Callback with latest config data.
-					 *
-					 * For example, config data in Nacos is:
-					 *
-					 * user.name=Nacos user.age=25
 					 * @param configInfo latest config data for specific dataId in Nacos
 					 * server
 					 */

diff --git a/...ibaba-examples/nacos-example/nacos-config-example/src/main/resources/bootstrap.properties b/...ibaba-examples/nacos-example/nacos-config-example/src/main/resources/bootstrap.properties
@@ -5,21 +5,27 @@ spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.username=nacos
 spring.cloud.nacos.password=nacos
 
+## nacos-namespace cannot user 'public',cause by 'public' has special handing inside.
 #spring.cloud.nacos.config.namespace=public
-spring.cloud.nacos.config.name=test-aaa
-spring.cloud.nacos.config.file-extension=yaml
 
+## you can specify a custom name if you don't want to use the application name.
+#spring.cloud.nacos.config.name=test-aaa
+#spring.cloud.nacos.config.file-extension=yaml
+
+## not recommended.
 #spring.cloud.nacos.config.refreshable-dataids=common.properties
+## not recommended.
 #spring.cloud.nacos.config.shared-data-ids=common.properties,base-common.properties
-#spring.cloud.nacos.config.shared-configs[0]= common333.properties
-#spring.cloud.nacos.config.shared-configs[1].data-id= common111.properties
-#spring.cloud.nacos.config.shared-configs[1].group= GROUP_APP1
-#spring.cloud.nacos.config.shared-configs[1].refresh= true
-#spring.cloud.nacos.config.shared-configs[2]= common222.properties
+
+## recommended.
 spring.cloud.nacos.config.shared-configs[0].data-id= test2.yaml
 spring.cloud.nacos.config.shared-configs[0].refresh=true
+## the default value is 'DEFAULT_GROUP' , if not specified.
+spring.cloud.nacos.config.shared-configs[0].group= GROUP_APP1
 
+## not recommended.
 #spring.cloud.nacos.config.ext-config[0]=ext.properties
+## recommended.
 spring.cloud.nacos.config.extension-configs[0].data-id= extension1.properties
 spring.cloud.nacos.config.extension-configs[0].refresh=true
 spring.cloud.nacos.config.extension-configs[1].data-id= test1.yml

diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md
@@ -72,7 +72,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 
 #### Query Service
 
-Enter `http://127.0.0.1:8848/nacos/v1/ns/instances?serviceName=service-provider` in the browser address bar and click Go to, we can see that the service node has been successfully registered to Nacos Server.
+Enter `http://127.0.0.1:8848/nacos/#/serviceDetail?name=service-provider&groupName=DEFAULT_GROUP` in the browser address bar and click Go to, we can see that the service node has been successfully registered to Nacos Server.
 
 ![查询服务](https://cdn.nlark.com/lark/0/2018/png/54319/1536986288092-5cf96af9-9a26-466b-85f6-39ad1d92dfdc.png)
 

diff --git a/spring-cloud-alibaba-examples/rocketmq-example/readme.md b/spring-cloud-alibaba-examples/rocketmq-example/readme.md
@@ -73,7 +73,7 @@ spring.cloud.stream.bindings.input.group=test-group
 
 You should startup Name Server and Broker before using RocketMQ Binder.
 
-1. Download [RocketMQ](https://www.apache.org/dyn/closer.cgi?path=rocketmq/4.3.2/rocketmq-all-4.3.2-bin-release.zip) and unzip it.
+1. Download [RocketMQ](https://archive.apache.org/dist/rocketmq/4.3.2/rocketmq-all-4.3.2-bin-release.zip) and unzip it.
 
 2. Startup Name Server
 

diff --git a/...consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java b/...consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java
@@ -74,10 +74,14 @@ public void run(String... args) throws InterruptedException {
 			while (true) {
 				mySink.input5().poll(m -> {
 					String payload = (String) m.getPayload();
+					if (payload.contains("0")) {
+						throw new IllegalArgumentException(
+								"111111111111111111111111111111111111111111");
+					}
 					System.out.println("pull msg: " + payload);
 				}, new ParameterizedTypeReference<String>() {
 				});
-				Thread.sleep(2_000);
+				Thread.sleep(5_00);
 			}
 		}
 

diff --git a/...les/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml b/...les/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml
@@ -15,6 +15,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-commons</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/...let-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java b/...let-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
@@ -52,8 +52,8 @@
 import org.springframework.web.servlet.HttpServletBean;
 import org.springframework.web.util.UriComponents;
 
-import static org.apache.commons.lang3.StringUtils.substringAfter;
-import static org.apache.commons.lang3.StringUtils.substringBetween;
+import static com.alibaba.cloud.commons.lang.StringUtils.substringAfter;
+import static com.alibaba.cloud.commons.lang.StringUtils.substringBetween;
 import static org.springframework.web.util.UriComponentsBuilder.fromUriString;
 
 @WebServlet(urlPatterns = "/dsc/*")

diff --git a/spring-cloud-alibaba-starters/pom.xml b/spring-cloud-alibaba-starters/pom.xml
@@ -27,6 +27,7 @@
         <module>spring-cloud-starter-alibaba-sentinel</module>
         <module>spring-cloud-alibaba-sentinel-datasource</module>
         <module>spring-cloud-alibaba-sentinel-gateway</module>
+        <module>spring-cloud-alibaba-commons</module>
     </modules>
 
     <build>

diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-commons/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-alibaba-commons/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.alibaba.cloud</groupId>
+        <artifactId>spring-cloud-alibaba-starters</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spring-cloud-alibaba-commons</artifactId>
+    <name>Spring Cloud Alibaba Commons</name>
+
+
+</project>