update seata 1.6.0 => 1.6.1

pom.xml

@@ -43,7 +43,7 @@
 
         <!-- alibaba 相关依赖 -->
         <sentinel.version>1.8.6</sentinel.version>
-        <seata.version>1.6.0</seata.version>
+        <seata.version>1.6.1</seata.version>
         <nacos.version>2.2.0</nacos.version>
         <dubbo.version>3.1.3</dubbo.version>
 

ruoyi-common/ruoyi-common-alibaba-bom/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
         <sentinel.version>1.8.6</sentinel.version>
-        <seata.version>1.6.0</seata.version>
+        <seata.version>1.6.1</seata.version>
         <nacos.client.version>2.2.0</nacos.client.version>
         <dubbo.version>3.1.3</dubbo.version>
         <spring.context.support.version>1.0.11</spring.context.support.version>

ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java

@@ -38,7 +38,7 @@ import javax.sql.DataSource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static io.seata.core.constants.RedisKeyConstants.DEFAULT_LOG_QUERY_LIMIT;
+import static io.seata.common.DefaultValues.DEFAULT_QUERY_LIMIT;
 
 /**
  * The type Database transaction store manager.
@@ -83,7 +83,7 @@ public class DataBaseTransactionStoreManager extends AbstractTransactionStoreMan
      * Instantiates a new Database transaction store manager.
      */
     private DataBaseTransactionStoreManager() {
-        logQueryLimit = CONFIG.getInt(ConfigurationKeys.STORE_DB_LOG_QUERY_LIMIT, DEFAULT_LOG_QUERY_LIMIT);
+        logQueryLimit = CONFIG.getInt(ConfigurationKeys.STORE_DB_LOG_QUERY_LIMIT, DEFAULT_QUERY_LIMIT);
         String datasourceType = CONFIG.getConfig(ConfigurationKeys.STORE_DB_DATASOURCE_TYPE);
         //init dataSource
         DataSource logStoreDataSource = EnhancedServiceLoader.load(DataSourceProvider.class, datasourceType).provide();

ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java

@@ -29,6 +29,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import static io.seata.common.DefaultValues.*;
+
 /**
  * @author funkye
  */
@@ -43,13 +45,6 @@ public class JedisPooledFactory {
     private static final String HOST = "127.0.0.1";
 
     private static final int PORT = 6379;
-
-    private static final int MINCONN = 1;
-
-    private static final int MAXCONN = 10;
-
-    private static final int MAXTOTAL = 100;
-
     private static final int DATABASE = 0;
 
     private static final int SENTINEL_HOST_NUMBER = 3;
@@ -83,9 +78,11 @@ public class JedisPooledFactory {
                             }
                         }
                         JedisPoolConfig poolConfig = new JedisPoolConfig();
-                        poolConfig.setMinIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MIN_CONN, MINCONN));
-                        poolConfig.setMaxIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_CONN, MAXCONN));
-                        poolConfig.setMaxTotal(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_TOTAL, MAXTOTAL));
+                        poolConfig.setMinIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MIN_CONN,
+                            DEFAULT_REDIS_MIN_IDLE));
+                        poolConfig.setMaxIdle(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_CONN,
+                            DEFAULT_REDIS_MAX_IDLE));
+                        poolConfig.setMaxTotal(CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_MAX_TOTAL, DEFAULT_REDIS_MAX_TOTAL));
                         String mode = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_MODE,ConfigurationKeys.REDIS_SINGLE_MODE);
                         if (mode.equals(ConfigurationKeys.REDIS_SENTINEL_MODE)) {
                             String masterName = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_MASTERNAME);

ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java

@@ -47,6 +47,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static io.seata.common.ConfigurationKeys.STORE_REDIS_QUERY_LIMIT;
+import static io.seata.common.DefaultValues.DEFAULT_QUERY_LIMIT;
 import static io.seata.core.constants.RedisKeyConstants.*;
 
 /**
@@ -110,7 +111,7 @@ public class RedisTransactionStoreManager extends AbstractTransactionStoreManage
         super();
         initGlobalMap();
         initBranchMap();
-        logQueryLimit = CONFIG.getInt(STORE_REDIS_QUERY_LIMIT, DEFAULT_LOG_QUERY_LIMIT);
+        logQueryLimit = CONFIG.getInt(STORE_REDIS_QUERY_LIMIT, DEFAULT_QUERY_LIMIT);
     }
 
     /**