sync & commit in finchley

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

@@ -17,16 +17,16 @@ package com.alibaba.cloud.examples;
 
 import java.sql.SQLException;
 
+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 io.seata.rm.datasource.DataSourceProxy;
-
 /**
  * @author xiaojing
  */

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

@@ -21,8 +21,10 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Random;
 
+import io.seata.core.context.RootContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -38,8 +40,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import io.seata.core.context.RootContext;
-
 /**
  * @author xiaojing
  */

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

@@ -4,7 +4,7 @@ transport {
   #NIO NATIVE
   server = "NIO"
   #enable heartbeat
-  heartbeat = true
+  heartbeat = false
   #thread factory for netty
   thread-factory {
     boss-thread-prefix = "NettyBoss"
@@ -28,7 +28,7 @@ transport {
 }
 service {
   #vgroup->rgroup
-  vgroup_mapping.order-service-fescar-service-group = "default"
+  vgroup_mapping.order-service-seata-service-group = "default"
   #only support single node
   default.grouplist = "127.0.0.1:8091"
   #degrade current not support
@@ -46,17 +46,22 @@ client {
     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"
 }
 
-## metrics settings
-metrics {
-  enabled = false
-  registry-type = "compact"
-  # multi exporters use comma divided
-  exporter-list = "prometheus"
-  exporter-prometheus-port = 9898
+support {
+  ## spring
+  spring {
+    # auto proxy the DataSource bean
+    datasource.autoproxy = false
+  }
 }

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

@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "localhost"
-    namespace = "public"
+    namespace = ""
     cluster = "default"
   }
   eureka {
@@ -50,8 +50,7 @@ config {
 
   nacos {
     serverAddr = "localhost"
-    namespace = "public"
-    cluster = "default"
+    namespace = ""
   }
   consul {
     serverAddr = "127.0.0.1:8500"