From 70c1a37bbd95bd3850d23c902fbe82aaf835adae Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 四月 2022 12:16:03 +0800
Subject: [PATCH] update 删除一些基本用不上的配置 简化折叠一些配置
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 43 +++++--------------------------------------
1 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
index 6fa54e2..da18cfd 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
@@ -11,15 +11,14 @@
import org.redisson.spring.cache.CacheConfig;
import org.redisson.spring.cache.RedissonSpringCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
-import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,9 +43,9 @@
@Autowired
private RedissonProperties redissonProperties;
+ @Primary
@Bean(destroyMethod = "shutdown")
- @ConditionalOnMissingBean(RedissonClient.class)
- public RedissonClient redisson() throws IOException {
+ public RedissonClient redisson() {
String prefix = REDIS_PROTOCOL_PREFIX;
if (redisProperties.isSsl()) {
prefix = REDISS_PROTOCOL_PREFIX;
@@ -54,8 +53,7 @@
Config config = new Config();
config.setThreads(redissonProperties.getThreads())
.setNettyThreads(redissonProperties.getNettyThreads())
- .setCodec(JsonJacksonCodec.INSTANCE)
- .setTransportMode(redissonProperties.getTransportMode());
+ .setCodec(JsonJacksonCodec.INSTANCE);
RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
if (ObjectUtil.isNotNull(singleServerConfig)) {
@@ -66,16 +64,11 @@
.setDatabase(redisProperties.getDatabase())
.setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
.setTimeout(singleServerConfig.getTimeout())
- .setRetryAttempts(singleServerConfig.getRetryAttempts())
- .setRetryInterval(singleServerConfig.getRetryInterval())
- .setSubscriptionsPerConnection(singleServerConfig.getSubscriptionsPerConnection())
.setClientName(singleServerConfig.getClientName())
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
- .setSubscriptionConnectionMinimumIdleSize(singleServerConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
.setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
- .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
- .setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
+ .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize());
}
// 闆嗙兢閰嶇疆鏂瑰紡 鍙傝�冧笅鏂规敞閲�
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
@@ -91,21 +84,13 @@
.setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
.setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
.setTimeout(clusterServersConfig.getTimeout())
- .setRetryAttempts(clusterServersConfig.getRetryAttempts())
- .setRetryInterval(clusterServersConfig.getRetryInterval())
- .setSubscriptionsPerConnection(clusterServersConfig.getSubscriptionsPerConnection())
.setClientName(clusterServersConfig.getClientName())
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
- .setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval())
- .setSubscriptionConnectionMinimumIdleSize(clusterServersConfig.getSubscriptionConnectionMinimumIdleSize())
.setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
.setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
.setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
.setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
.setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
- .setDnsMonitoringInterval(clusterServersConfig.getDnsMonitoringInterval())
- .setFailedSlaveReconnectionInterval(clusterServersConfig.getFailedSlaveReconnectionInterval())
- .setScanInterval(clusterServersConfig.getScanInterval())
.setReadMode(clusterServersConfig.getReadMode())
.setSubscriptionMode(clusterServersConfig.getSubscriptionMode())
.setNodeAddresses(nodes);
@@ -153,8 +138,6 @@
* threads: 16
* # Netty绾跨▼姹犳暟閲�
* nettyThreads: 32
- * # 浼犺緭妯″紡
- * transportMode: "NIO"
* # 闆嗙兢閰嶇疆
* clusterServersConfig:
* # 瀹㈡埛绔悕绉�
@@ -169,26 +152,10 @@
* slaveConnectionPoolSize: 64
* # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
* idleConnectionTimeout: 10000
- * # ping杩炴帴闂撮殧
- * pingConnectionInterval: 1000
* # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
* timeout: 3000
- * # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
- * retryAttempts: 3
- * # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
- * retryInterval: 1500
- * # 浠庡彲鐢ㄦ湇鍔″櫒鐨勫唴閮ㄥ垪琛ㄤ腑鎺掗櫎 Redis Slave 閲嶆柊杩炴帴灏濊瘯鐨勯棿闅斻��
- * failedSlaveReconnectionInterval: 3000
- * # 鍙戝竷鍜岃闃呰繛鎺ユ睜鏈�灏忕┖闂茶繛鎺ユ暟
- * subscriptionConnectionMinimumIdleSize: 1
* # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
* subscriptionConnectionPoolSize: 50
- * # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
- * subscriptionsPerConnection: 5
- * # 鎵弿闂撮殧
- * scanInterval: 1000
- * # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
- * dnsMonitoringInterval: 5000
* # 璇诲彇妯″紡
* readMode: "SLAVE"
* # 璁㈤槄妯″紡
--
Gitblit v1.9.3