sync code from master

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

@@ -17,7 +17,7 @@ package org.springframework.cloud.alibaba.cloud.examples;
 
 import java.util.Random;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -16,17 +16,16 @@
 package org.springframework.cloud.alibaba.cloud.examples;
 
 import java.sql.SQLException;
-import java.util.Random;
 
+import com.alibaba.druid.pool.DruidDataSource;
+
+import io.seata.rm.datasource.DataSourceProxy;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fescar.rm.datasource.DataSourceProxy;
-
 /**
  * @author xiaojing
  */

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

@@ -1,5 +1,5 @@
 registry {
-  # file 、nacos 、redis
+  # file 、nacos 、eureka、redis、zk、consul
   type = "file"
 
   nacos {
@@ -7,17 +7,32 @@ registry {
     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
+  # file、nacos 、apollo、zk
   type = "file"
 
   nacos {
@@ -29,6 +44,11 @@ config {
     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"
   }