merge from 2.2.4.RELEASE

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

@@ -9,9 +9,9 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>order-service</artifactId>
 
-    <name>Spring Cloud Starter Alibaba Seata Example - Business Service</name>
+    <artifactId>order-service</artifactId>
+    <name>Spring Cloud Starter Alibaba Seata Example - Order Service</name>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -54,4 +54,4 @@
     </dependencies>
 
     
-</project>
+</project>

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderApplication.java

@@ -25,10 +25,10 @@ import org.springframework.web.client.RestTemplate;
  * @author xiaojing
  */
 @SpringBootApplication
-public class OderApplication {
+public class OrderApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(OderApplication.class, args);
+		SpringApplication.run(OrderApplication.class, args);
 	}
 
 	@Bean

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

@@ -1,67 +0,0 @@
-transport {
-  # tcp udt unix-domain-socket
-  type = "TCP"
-  #NIO NATIVE
-  server = "NIO"
-  #enable heartbeat
-  heartbeat = false
-  #thread factory for netty
-  thread-factory {
-    boss-thread-prefix = "NettyBoss"
-    worker-thread-prefix = "NettyServerNIOWorker"
-    server-executor-thread-prefix = "NettyServerBizHandler"
-    share-boss-worker = false
-    client-selector-thread-prefix = "NettyClientSelector"
-    client-selector-thread-size = 1
-    client-worker-thread-prefix = "NettyClientWorkerThread"
-    # netty boss thread size,will not be used for UDT
-    boss-thread-size = 1
-    #auto default pin or 8
-    worker-thread-size = 8
-  }
-  shutdown {
-    # when destroy server, wait seconds
-    wait = 3
-  }
-  serialization = "seata"
-  compressor = "none"
-}
-service {
-  #vgroup->rgroup
-  vgroup_mapping.order-service-seata-service-group = "default"
-  #only support single node
-  default.grouplist = "127.0.0.1:8091"
-  #degrade current not support
-  enableDegrade = false
-  #disable
-  disable = false
-  #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
-  max.commit.retry.timeout = "-1"
-  max.rollback.retry.timeout = "-1"
-}
-client {
-  async.commit.buffer.limit = 10000
-  lock {
-    retry.internal = 10
-    retry.times = 30
-  }
-  report.retry.count = 5
-  tm.commit.retry.count = 1
-  tm.rollback.retry.count = 1
-}
-transaction {
-  undo.data.validation = true
-  undo.log.serialization = "jackson"
-  undo.log.save.days = 7
-  #schedule delete expired undo_log in milliseconds
-  undo.log.delete.period = 86400000
-  undo.log.table = "undo_log"
-}
-
-support {
-  ## spring
-  spring {
-    # auto proxy the DataSource bean
-    datasource.autoproxy = false
-  }
-}

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

@@ -1,73 +0,0 @@
-registry {
-  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = ""
-    cluster = "default"
-  }
-  eureka {
-    serviceUrl = "http://localhost:8761/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"
-  }
-  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
-  type = "file"
-
-  nacos {
-    serverAddr = "localhost"
-    namespace = ""
-  }
-  consul {
-    serverAddr = "127.0.0.1:8500"
-  }
-  apollo {
-    app.id = "seata-server"
-    apollo.meta = "http://192.168.1.204:8801"
-  }
-  zk {
-    serverAddr = "127.0.0.1:2181"
-    session.timeout = 6000
-    connect.timeout = 2000
-  }
-  etcd3 {
-    serverAddr = "http://localhost:2379"
-  }
-  file {
-    name = "file.conf"
-  }
-}