upgrade seata to 1.1.0 (apache#308)

msnetc · Feb 20, 2020 · c81c71c · c81c71c
1 parent 8f29cf7
commit c81c71c
Show file tree

Hide file tree

Showing 148 changed files with 2,509 additions and 1,335 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seata-samples</artifactId>
         <groupId>io.seata</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>seata-samples-api</artifactId>

diff --git a/api/src/main/resources/file.conf b/api/src/main/resources/file.conf
@@ -1,6 +1,6 @@
 service {
   #vgroup->rgroup
-  vgroup_mapping.my_test_tx_group = "default"
+  vgroupMapping.my_test_tx_group = "default"
   #only support single node
   default.grouplist = "127.0.0.1:8091"
   #degrade current not support

diff --git a/api/src/main/resources/registry.conf b/api/src/main/resources/registry.conf
@@ -1,49 +1,80 @@
 registry {
-  # file 、nacos 、eureka、redis、zk
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "file"
 
   nacos {
     serverAddr = "localhost"
-    namespace = "public"
+    namespace = ""
     cluster = "default"
   }
   eureka {
-    serviceUrl = "http://localhost:1001/eureka"
+    serviceUrl = "http://localhost:8761/eureka"
     application = "default"
     weight = "1"
   }
   redis {
     serverAddr = "localhost:6379"
     db = "0"
+    password = ""
+    cluster = "default"
+    timeout = "0"
   }
   zk {
     cluster = "default"
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
+  }
+  consul {
+    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"
   }
 }
 
 config {
-  # file、nacos 、apollo、zk
+  # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig
   type = "file"
 
   nacos {
     serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
+    namespace = ""
+    group = "SEATA_GROUP"
+  }
+  consul {
+    serverAddr = "127.0.0.1:8500"
   }
   apollo {
-    app.id = "fescar-server"
+    app.id = "seata-server"
     apollo.meta = "http://192.168.1.204:8801"
+    namespace = "application"
   }
   zk {
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
+  }
+  etcd3 {
+    serverAddr = "http://localhost:2379"
   }
   file {
     name = "file.conf"

diff --git a/dubbo-multiple-datasource-mybatis-plus/consumer/pom.xml b/dubbo-multiple-datasource-mybatis-plus/consumer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.seata</groupId>
     <artifactId>dubbo-multiple-datasource-mybatis-plus</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <artifactId>consumer</artifactId>
   <name>consumer</name>

diff --git a/dubbo-multiple-datasource-mybatis-plus/consumer/src/main/resources/registry.conf b/dubbo-multiple-datasource-mybatis-plus/consumer/src/main/resources/registry.conf
@@ -1,33 +1,82 @@
 registry {
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "nacos"
-  file {
-    name = "file.conf"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = ""
+    cluster = "default"
   }
-   zk {
+  eureka {
+    serviceUrl = "http://localhost:8761/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+    password = ""
+    cluster = "default"
+    timeout = "0"
+  }
+  zk {
     cluster = "default"
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
   }
-    nacos {
-    serverAddr = "127.0.0.1:8848"
-    namespace = ""
+  consul {
+    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"
   }
 }
+
 config {
+  # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig
   type = "nacos"
-  file {
-    name = "file.conf"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = ""
+    group = "SEATA_GROUP"
+  }
+  consul {
+    serverAddr = "127.0.0.1:8500"
+  }
+  apollo {
+    app.id = "seata-server"
+    apollo.meta = "http://192.168.1.204:8801"
+    namespace = "application"
   }
   zk {
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
   }
-    nacos {
-    serverAddr = "127.0.0.1:8848"
-    namespace = ""
-    cluster = "default"
+  etcd3 {
+    serverAddr = "http://localhost:2379"
+  }
+  file {
+    name = "file.conf"
   }
 }
diff --git a/dubbo-multiple-datasource-mybatis-plus/pom.xml b/dubbo-multiple-datasource-mybatis-plus/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.seata</groupId>
 		<artifactId>seata-samples</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>dubbo-multiple-datasource-mybatis-plus</artifactId>
 	<name>dubbo-multiple-datasource-mybatis-plus</name>
@@ -57,7 +57,6 @@
 		<dependency>
 			<groupId>io.seata</groupId>
 			<artifactId>seata-all</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>

diff --git a/dubbo-multiple-datasource-mybatis-plus/provider/pom.xml b/dubbo-multiple-datasource-mybatis-plus/provider/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>io.seata</groupId>
 		<artifactId>dubbo-multiple-datasource-mybatis-plus</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>provider</artifactId>
 	<name>provider</name>

diff --git a/dubbo-multiple-datasource-mybatis-plus/provider/src/main/resources/registry.conf b/dubbo-multiple-datasource-mybatis-plus/provider/src/main/resources/registry.conf
@@ -1,33 +1,82 @@
 registry {
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
   type = "nacos"
-  file {
-    name = "file.conf"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = ""
+    cluster = "default"
   }
-   zk {
+  eureka {
+    serviceUrl = "http://localhost:8761/eureka"
+    application = "default"
+    weight = "1"
+  }
+  redis {
+    serverAddr = "localhost:6379"
+    db = "0"
+    password = ""
+    cluster = "default"
+    timeout = "0"
+  }
+  zk {
     cluster = "default"
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
   }
-    nacos {
-    serverAddr = "127.0.0.1:8848"
-    namespace = ""
+  consul {
+    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"
   }
 }
+
 config {
+  # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig
   type = "nacos"
-  file {
-    name = "file.conf"
+
+  nacos {
+    serverAddr = "localhost"
+    namespace = ""
+    group = "SEATA_GROUP"
+  }
+  consul {
+    serverAddr = "127.0.0.1:8500"
+  }
+  apollo {
+    app.id = "seata-server"
+    apollo.meta = "http://192.168.1.204:8801"
+    namespace = "application"
   }
   zk {
     serverAddr = "127.0.0.1:2181"
     session.timeout = 6000
     connect.timeout = 2000
+    username = ""
+    password = ""
   }
-    nacos {
-    serverAddr = "127.0.0.1:8848"
-    namespace = ""
-    cluster = "default"
+  etcd3 {
+    serverAddr = "http://localhost:2379"
+  }
+  file {
+    name = "file.conf"
   }
 }
diff --git a/dubbo/pom.xml b/dubbo/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.seata</groupId>
         <artifactId>seata-samples</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>seata-samples-dubbo</artifactId>