sync code from master

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml

@@ -25,4 +25,13 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml

@@ -25,4 +25,14 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

spring-cloud-alibaba-examples/fescar-example/account-service/src/main/resources/registry.conf

@@ -1,35 +0,0 @@
-registry {
-  # file 、nacos 、redis
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  redis {
-    serverAddr = "localhost:6379"
-    db = "0"
-  }
-  file {
-    name = "file.conf"
-  }
-}
-
-config {
-  # file nacos apollo
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
-  file {
-    name = "file.conf"
-  }
-}

spring-cloud-alibaba-examples/fescar-example/business-service/src/main/resources/registry.conf

@@ -1,35 +0,0 @@
-registry {
-  # file 、nacos 、redis
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  redis {
-    serverAddr = "localhost:6379"
-    db = "0"
-  }
-  file {
-    name = "file.conf"
-  }
-}
-
-config {
-  # file nacos apollo
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
-  file {
-    name = "file.conf"
-  }
-}

spring-cloud-alibaba-examples/fescar-example/order-service/src/main/resources/registry.conf

@@ -1,35 +0,0 @@
-registry {
-  # file 、nacos 、redis
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  redis {
-    serverAddr = "localhost:6379"
-    db = "0"
-  }
-  file {
-    name = "file.conf"
-  }
-}
-
-config {
-  # file nacos apollo
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
-  file {
-    name = "file.conf"
-  }
-}

spring-cloud-alibaba-examples/fescar-example/storage-service/src/main/resources/registry.conf

@@ -1,35 +0,0 @@
-registry {
-  # file 、nacos 、redis
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  redis {
-    serverAddr = "localhost:6379"
-    db = "0"
-  }
-  file {
-    name = "file.conf"
-  }
-}
-
-config {
-  # file nacos apollo
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
-  }
-  apollo {
-    app.id = "fescar-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
-  file {
-    name = "file.conf"
-  }
-}

spring-cloud-alibaba-examples/pom.xml

@@ -26,10 +26,10 @@
         <module>ans-example/ans-consumer-feign-example</module>
         <module>ans-example/ans-consumer-ribbon-example</module>
         <module>ans-example/ans-provider-example</module>
-        <module>fescar-example/business-service</module>
-        <module>fescar-example/order-service</module>
-        <module>fescar-example/storage-service</module>
-        <module>fescar-example/account-service</module>
+        <module>seata-example/business-service</module>
+        <module>seata-example/order-service</module>
+        <module>seata-example/storage-service</module>
+        <module>seata-example/account-service</module>
         <module>acm-example/acm-local-example</module>
         <module>rocketmq-example/rocketmq-consume-example</module>
         <module>rocketmq-example/rocketmq-produce-example</module>

spring-cloud-alibaba-examples/seata-example/account-service/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-fescar</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -16,6 +16,7 @@
 package org.springframework.cloud.alibaba.cloud.examples;
 
 import java.sql.SQLException;
+import java.util.Random;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -53,7 +54,8 @@ public class DatabaseConfiguration {
 		String password = environment.getProperty("mysql.user.password");
 
 		DruidDataSource druidDataSource = new DruidDataSource();
-		druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
+		druidDataSource.setUrl(
+				"jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
 		druidDataSource.setUsername(userName);
 		druidDataSource.setPassword(password);
 		druidDataSource.setDriverClassName("com.mysql.jdbc.Driver");

spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/file.conf

@@ -20,17 +20,26 @@ transport {
     worker-thread-size = 8
   }
 }
+store {
+  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  max-branch-session-size = 16384
+  # globe session size , if exceeded throws exceptions
+  max-global-session-size = 512
+  # file buffer size , if exceeded allocate new buffer
+  file-write-buffer-cache-size = 16384
+  # when recover batch read size
+  session.reload.read_size = 100
+}
 service {
   #vgroup->rgroup
-  vgroup_mapping.account-service-fescar-service-group = "localRgroup"
+  vgroup_mapping.account-service-fescar-service-group = "default"
   #only support single node
-  localRgroup.grouplist = "127.0.0.1:8091"
+  default.grouplist = "127.0.0.1:8091"
   #degrade current not support
   enableDegrade = false
   #disable
   disable = false
 }
-
 client {
   async.commit.buffer.limit = 10000
   lock {

spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/registry.conf

@@ -0,0 +1,55 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  eureka {
+    serviceUrl = "http://localhost:1001/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+  }
+  zk {
+    cluster = "default"
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  consul {
+    cluster = "default"
+    serverAddr = "127.0.0.1:8500"
+  }
+  file {
+    name = "file.conf"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  apollo {
+    app.id = "fescar-server"
+    apollo.meta = "http://192.168.1.204:8801"
+  }
+  zk {
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  file {
+    name = "file.conf"
+  }
+}

spring-cloud-alibaba-examples/seata-example/business-service/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-fescar</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/file.conf

@@ -20,17 +20,26 @@ transport {
     worker-thread-size = 8
   }
 }
+store {
+  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  max-branch-session-size = 16384
+  # globe session size , if exceeded throws exceptions
+  max-global-session-size = 512
+  # file buffer size , if exceeded allocate new buffer
+  file-write-buffer-cache-size = 16384
+  # when recover batch read size
+  session.reload.read_size = 100
+}
 service {
   #vgroup->rgroup
-  vgroup_mapping.storage-service-fescar-service-group = "localRgroup"
+  vgroup_mapping.business-service-fescar-service-group = "default"
   #only support single node
-  localRgroup.grouplist = "127.0.0.1:8091"
+  default.grouplist = "127.0.0.1:8091"
   #degrade current not support
   enableDegrade = false
   #disable
   disable = false
 }
-
 client {
   async.commit.buffer.limit = 10000
   lock {

spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/registry.conf

@@ -0,0 +1,55 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  eureka {
+    serviceUrl = "http://localhost:1001/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+  }
+  zk {
+    cluster = "default"
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  consul {
+    cluster = "default"
+    serverAddr = "127.0.0.1:8500"
+  }
+  file {
+    name = "file.conf"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  apollo {
+    app.id = "fescar-server"
+    apollo.meta = "http://192.168.1.204:8801"
+  }
+  zk {
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  file {
+    name = "file.conf"
+  }
+}

spring-cloud-alibaba-examples/seata-example/order-service/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-fescar</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/file.conf

@@ -20,17 +20,26 @@ transport {
     worker-thread-size = 8
   }
 }
+store {
+  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  max-branch-session-size = 16384
+  # globe session size , if exceeded throws exceptions
+  max-global-session-size = 512
+  # file buffer size , if exceeded allocate new buffer
+  file-write-buffer-cache-size = 16384
+  # when recover batch read size
+  session.reload.read_size = 100
+}
 service {
   #vgroup->rgroup
-  vgroup_mapping.business-service-fescar-service-group = "localRgroup"
+  vgroup_mapping.order-service-fescar-service-group = "default"
   #only support single node
-  localRgroup.grouplist = "127.0.0.1:8091"
+  default.grouplist = "127.0.0.1:8091"
   #degrade current not support
   enableDegrade = false
   #disable
   disable = false
 }
-
 client {
   async.commit.buffer.limit = 10000
   lock {

spring-cloud-alibaba-examples/seata-example/order-service/src/main/resources/registry.conf

@@ -0,0 +1,55 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  eureka {
+    serviceUrl = "http://localhost:1001/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+  }
+  zk {
+    cluster = "default"
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  consul {
+    cluster = "default"
+    serverAddr = "127.0.0.1:8500"
+  }
+  file {
+    name = "file.conf"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  apollo {
+    app.id = "fescar-server"
+    apollo.meta = "http://192.168.1.204:8801"
+  }
+  zk {
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  file {
+    name = "file.conf"
+  }
+}

spring-cloud-alibaba-examples/seata-example/readme-zh.md

@@ -1,11 +1,11 @@
-# Fescar Example
+# Seata Example
 
 ## 项目说明
 
 
-本项目演示如何使用 Fescar Starter 完成 Spring Cloud 应用的分布式事务接入。
+本项目演示如何使用 Seata Starter 完成 Spring Cloud 应用的分布式事务接入。
 
-[Fescar](https://github.com/alibaba/fescar) 是 阿里巴巴 开源的 分布式事务中间件，以 高效 并且对业务 0 侵入 的方式，解决 微服务 场景下面临的分布式事务问题。
+[Seata](https://github.com/seata/seata) 是 阿里巴巴 开源的 分布式事务中间件，以 高效 并且对业务 0 侵入 的方式，解决 微服务 场景下面临的分布式事务问题。
 
 
 
@@ -40,11 +40,12 @@ mysql.user.password=your mysql server password
 
 ```
 
-### 创建 UNDO_LOG 表
+### 创建 undo_log 表
 
-[Fescar AT 模式]() 需要使用到 UNDO_LOG 表。
+[Fescar AT 模式]() 需要使用到 undo_log 表。
 
 ``` $sql
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
 CREATE TABLE `undo_log` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `branch_id` bigint(20) NOT NULL,
@@ -55,8 +56,8 @@ CREATE TABLE `undo_log` (
   `log_modified` datetime NOT NULL,
   `ext` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `idx_unionkey` (`xid`,`branch_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8
+  UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 ```
 
 ### 创建 示例中 业务所需要的数据库表

spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-fescar</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/file.conf

@@ -20,17 +20,26 @@ transport {
     worker-thread-size = 8
   }
 }
+store {
+  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  max-branch-session-size = 16384
+  # globe session size , if exceeded throws exceptions
+  max-global-session-size = 512
+  # file buffer size , if exceeded allocate new buffer
+  file-write-buffer-cache-size = 16384
+  # when recover batch read size
+  session.reload.read_size = 100
+}
 service {
   #vgroup->rgroup
-  vgroup_mapping.order-service-fescar-service-group = "localRgroup"
+  vgroup_mapping.storage-service-fescar-service-group = "default"
   #only support single node
-  localRgroup.grouplist = "127.0.0.1:8091"
+  default.grouplist = "127.0.0.1:8091"
   #degrade current not support
   enableDegrade = false
   #disable
   disable = false
 }
-
 client {
   async.commit.buffer.limit = 10000
   lock {

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/resources/registry.conf

@@ -0,0 +1,55 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  eureka {
+    serviceUrl = "http://localhost:1001/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+  }
+  zk {
+    cluster = "default"
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  consul {
+    cluster = "default"
+    serverAddr = "127.0.0.1:8500"
+  }
+  file {
+    name = "file.conf"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk
+  type = "file"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = "public"
+    cluster = "default"
+  }
+  apollo {
+    app.id = "fescar-server"
+    apollo.meta = "http://192.168.1.204:8801"
+  }
+  zk {
+    serverAddr = "127.0.0.1:2181"
+    session.timeout = 6000
+    connect.timeout = 2000
+  }
+  file {
+    name = "file.conf"
+  }
+}