Merge pull request #638 from slievrly/master

upgrade Seata version to 0.5.1

spring-cloud-alibaba-dependencies/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <sentinel.version>1.6.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <seata.version>0.5.0</seata.version>
+        <seata.version>0.5.1</seata.version>
         <nacos.client.version>1.0.0</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <acm.version>1.0.9</acm.version>

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

@@ -20,15 +20,35 @@ transport {
     worker-thread-size = 8
   }
 }
+## transaction log store
 store {
-  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  ## store mode: file、db
-  max-branch-session-size = 16384
+  mode = "file"
-  # globe session size , if exceeded throws exceptions
+
-  max-global-session-size = 512
+  ## file store
-  # file buffer size , if exceeded allocate new buffer
+  file {
-  file-write-buffer-cache-size = 16384
+    dir = "sessionStore"
-  # when recover batch read size
+
-  session.reload.read_size = 100
+    # 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
+    # async, sync
+    flush-disk-mode = async
+  }
+
+  ## database store
+  db {
+    driver_class = ""
+    url = ""
+    user = ""
+    password = ""
+  }
+
 }
 service {
   #vgroup->rgroup

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

@@ -1,5 +1,5 @@
 registry {
-  # file 、nacos 、eureka、redis、zk、consul
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "file"
 
   nacos {
@@ -26,6 +26,19 @@ registry {
     cluster = "default"
     serverAddr = "127.0.0.1:8500"
   }
+  etcd3 {
+    cluster = "default"
+    serverAddr = "http://localhost:2379"
+  }
+  sofa {
+    serverAddr = "127.0.0.1:9603"
+    application = "default"
+    region = "DEFAULT_ZONE"
+    datacenter = "DefaultDataCenter"
+    cluster = "default"
+    group = "SEATA_GROUP"
+    addressWaitTime = "3000"
+  }
   file {
     name = "file.conf"
   }
@@ -41,7 +54,7 @@ config {
     cluster = "default"
   }
   apollo {
-    app.id = "fescar-server"
+    app.id = "seata-server"
     apollo.meta = "http://192.168.1.204:8801"
   }
   zk {
@@ -52,4 +65,4 @@ config {
   file {
     name = "file.conf"
   }
-}
+}

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

@@ -20,15 +20,35 @@ transport {
     worker-thread-size = 8
   }
 }
+## transaction log store
 store {
-  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  ## store mode: file、db
-  max-branch-session-size = 16384
+  mode = "file"
-  # globe session size , if exceeded throws exceptions
+
-  max-global-session-size = 512
+  ## file store
-  # file buffer size , if exceeded allocate new buffer
+  file {
-  file-write-buffer-cache-size = 16384
+    dir = "sessionStore"
-  # when recover batch read size
+
-  session.reload.read_size = 100
+    # 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
+    # async, sync
+    flush-disk-mode = async
+  }
+
+  ## database store
+  db {
+    driver_class = ""
+    url = ""
+    user = ""
+    password = ""
+  }
+
 }
 service {
   #vgroup->rgroup

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

@@ -1,5 +1,5 @@
 registry {
-  # file 、nacos 、eureka、redis、zk、consul
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "file"
 
   nacos {
@@ -26,6 +26,19 @@ registry {
     cluster = "default"
     serverAddr = "127.0.0.1:8500"
   }
+  etcd3 {
+    cluster = "default"
+    serverAddr = "http://localhost:2379"
+  }
+  sofa {
+    serverAddr = "127.0.0.1:9603"
+    application = "default"
+    region = "DEFAULT_ZONE"
+    datacenter = "DefaultDataCenter"
+    cluster = "default"
+    group = "SEATA_GROUP"
+    addressWaitTime = "3000"
+  }
   file {
     name = "file.conf"
   }
@@ -41,7 +54,7 @@ config {
     cluster = "default"
   }
   apollo {
-    app.id = "fescar-server"
+    app.id = "seata-server"
     apollo.meta = "http://192.168.1.204:8801"
   }
   zk {
@@ -52,4 +65,4 @@ config {
   file {
     name = "file.conf"
   }
-}
+}

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

@@ -101,7 +101,7 @@ CREATE TABLE `account_tbl` (
 进入解压之后的 bin 目录，执行如下命令来启动
 
 ```$shell
-sh seata-server.sh $LISTEN_PORT $MODE
+sh seata-server.sh $LISTEN_PORT $MODE(file or db)
 ```
 
 在这个示例中，采用如下命令来启动 Seata Server
@@ -110,7 +110,7 @@ sh seata-server.sh $LISTEN_PORT $MODE
 sh seata-server.sh 8091 file
 ```
 
-**注意** 如果你修改了endpoint且注册中心使用默认file类型，那么记得需要在各个示例工程中的 `file.conf` 文件中，修改 grouplist 的值。
+**注意** 如果你修改了endpoint且注册中心使用默认file类型，那么记得需要在各个示例工程中的 `file.conf` 文件中，修改 grouplist 的值(当registry.conf 中registry.type 或 config.type 为file 时会读取内部的file节点中的文件名，若type不为file将直接从配置类型的对应元数据的注册配置中心读取数据)，推荐大家使用 nacos 作为配置注册中心。
 
 
 ## 运行示例

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

@@ -20,15 +20,35 @@ transport {
     worker-thread-size = 8
   }
 }
+## transaction log store
 store {
-  # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+  ## store mode: file、db
-  max-branch-session-size = 16384
+  mode = "file"
-  # globe session size , if exceeded throws exceptions
+
-  max-global-session-size = 512
+  ## file store
-  # file buffer size , if exceeded allocate new buffer
+  file {
-  file-write-buffer-cache-size = 16384
+    dir = "sessionStore"
-  # when recover batch read size
+
-  session.reload.read_size = 100
+    # 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
+    # async, sync
+    flush-disk-mode = async
+  }
+
+  ## database store
+  db {
+    driver_class = ""
+    url = ""
+    user = ""
+    password = ""
+  }
+
 }
 service {
   #vgroup->rgroup

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

@@ -1,5 +1,5 @@
 registry {
-  # file 、nacos 、eureka、redis、zk、consul
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "file"
 
   nacos {
@@ -26,6 +26,19 @@ registry {
     cluster = "default"
     serverAddr = "127.0.0.1:8500"
   }
+  etcd3 {
+    cluster = "default"
+    serverAddr = "http://localhost:2379"
+  }
+  sofa {
+    serverAddr = "127.0.0.1:9603"
+    application = "default"
+    region = "DEFAULT_ZONE"
+    datacenter = "DefaultDataCenter"
+    cluster = "default"
+    group = "SEATA_GROUP"
+    addressWaitTime = "3000"
+  }
   file {
     name = "file.conf"
   }
@@ -41,7 +54,7 @@ config {
     cluster = "default"
   }
   apollo {
-    app.id = "fescar-server"
+    app.id = "seata-server"
     apollo.meta = "http://192.168.1.204:8801"
   }
   zk {
@@ -52,4 +65,4 @@ config {
   file {
     name = "file.conf"
   }
-}
+}