From 26a6d08d96d624652d0d482824c64cdee45b22c6 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 4 Jun 2024 11:33:09 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=20redisson=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/configuration/OrionRedisAutoConfiguration.java | 4 ++++ .../redis/configuration/config/RedissonConfig.java | 6 ++++++ .../resources/META-INF/spring-configuration-metadata.json | 6 ++++++ orion-visor-launch/src/main/resources/application-dev.yaml | 1 + orion-visor-launch/src/main/resources/application-prod.yaml | 1 + .../src/test/resources/application-unit-test.yaml | 1 + .../src/test/resources/application-unit-test.yaml | 1 + 7 files changed, 20 insertions(+) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java index daaebf39..b725d6f1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -7,6 +7,7 @@ import com.orion.visor.framework.redis.configuration.config.RedissonConfig; import com.orion.visor.framework.redis.core.lock.RedisLocker; import com.orion.visor.framework.redis.core.utils.RedisUtils; import org.redisson.api.RedissonClient; +import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; @@ -58,6 +59,9 @@ public class OrionRedisAutoConfiguration { return config -> { config.setThreads(redissonConfig.getThreads()); config.setNettyThreads(redissonConfig.getNettyThreads()); + // 单机配置 + SingleServerConfig single = config.useSingleServer(); + single.setConnectionMinimumIdleSize(redissonConfig.getMinimumIdleSize()); }; } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java index a9f03522..b1c38202 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java @@ -24,9 +24,15 @@ public class RedissonConfig { */ private Integer nettyThreads; + /** + * 最小空闲连接数 + */ + private Integer minimumIdleSize; + public RedissonConfig() { this.threads = 16; this.nettyThreads = 16; + this.minimumIdleSize = 16; } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json index b9f2c777..f6df31da 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json @@ -18,6 +18,12 @@ "type": "java.lang.Integer", "description": "netty 线程数.", "defaultValue": "16" + }, + { + "name": "spring.redisson.minimum-idle-size", + "type": "java.lang.Integer", + "description": "最小空闲连接数.", + "defaultValue": "16" } ] } \ No newline at end of file diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index c7b1a286..f0ffdc11 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -14,6 +14,7 @@ spring: redisson: threads: 2 netty-threads: 2 + minimum-idle-size: 2 mybatis-plus: configuration: diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index f2633b48..c85e6402 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -24,6 +24,7 @@ spring: redisson: threads: 4 netty-threads: 4 + minimum-idle-size: 4 quartz: properties: org: diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml index ef37b7bc..f349f31e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml @@ -24,6 +24,7 @@ spring: redisson: threads: 2 netty-threads: 2 + minimum-idle-size: 2 mybatis-plus: lazy-initialization: true diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/test/resources/application-unit-test.yaml b/orion-visor-module-infra/orion-visor-module-infra-service/src/test/resources/application-unit-test.yaml index ef37b7bc..f349f31e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/test/resources/application-unit-test.yaml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/test/resources/application-unit-test.yaml @@ -24,6 +24,7 @@ spring: redisson: threads: 2 netty-threads: 2 + minimum-idle-size: 2 mybatis-plus: lazy-initialization: true