diff --git a/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.0.jar b/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.1.jar similarity index 73% rename from docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.0.jar rename to docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.1.jar index 9b64f6c3..d5e6a4b4 100644 Binary files a/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.0.jar and b/docker/skywalking/agent/plugins/apm-seata-skywalking-plugin-1.6.1.jar differ diff --git a/pom.xml b/pom.xml index 0f67aecf..341ac76b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.8.6 - 1.6.0 + 1.6.1 2.2.0 3.1.3 diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 53e9feaf..33c30379 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -16,7 +16,7 @@ 2021.0.4.0 1.8.6 - 1.6.0 + 1.6.1 2.2.0 3.1.3 1.0.11 diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java index 421a21f6..e6eb83e6 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/db/store/DataBaseTransactionStoreManager.java +++ b/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(); diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java index b0f6c61c..6c32b7e9 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java +++ b/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); diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java b/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java index d680c462..573d120e 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/storage/redis/store/RedisTransactionStoreManager.java +++ b/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); } /**