From f9d9eb2d70458839d292a5d34d18ddc79888f80e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 12 一月 2023 15:11:56 +0800
Subject: [PATCH] fix 修复 新版本 Redisson 存在与 boot 2.X 的兼容性问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java | 109 ++----------------------------------------------------
1 files changed, 5 insertions(+), 104 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
index 0b9024d..b0bf285 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java
@@ -4,11 +4,8 @@
import lombok.NoArgsConstructor;
import org.redisson.config.ReadMode;
import org.redisson.config.SubscriptionMode;
-import org.redisson.config.TransportMode;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
-
-import java.util.List;
/**
* Redisson 閰嶇疆灞炴��
@@ -21,6 +18,11 @@
public class RedissonProperties {
/**
+ * redis缂撳瓨key鍓嶇紑
+ */
+ private String keyPrefix;
+
+ /**
* 绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
*/
private int threads;
@@ -31,11 +33,6 @@
private int nettyThreads;
/**
- * 浼犺緭妯″紡
- */
- private TransportMode transportMode;
-
- /**
* 鍗曟満鏈嶅姟閰嶇疆
*/
private SingleServerConfig singleServerConfig;
@@ -44,11 +41,6 @@
* 闆嗙兢鏈嶅姟閰嶇疆
*/
private ClusterServersConfig clusterServersConfig;
-
- /**
- * 缂撳瓨缁�
- */
- private List<CacheGroup> cacheGroup;
@Data
@NoArgsConstructor
@@ -80,34 +72,9 @@
private int timeout;
/**
- * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
- */
- private int retryAttempts;
-
- /**
- * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
- */
- private int retryInterval;
-
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int subscriptionConnectionMinimumIdleSize;
-
- /**
* 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
*/
private int subscriptionConnectionPoolSize;
-
- /**
- * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
- */
- private int subscriptionsPerConnection;
-
- /**
- * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
- */
- private int dnsMonitoringInterval;
}
@@ -146,54 +113,14 @@
private int idleConnectionTimeout;
/**
- * ping瓒呮椂
- */
- private int pingConnectionInterval;
-
- /**
* 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
*/
private int timeout;
/**
- * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
- */
- private int retryAttempts;
-
- /**
- * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
- */
- private int retryInterval;
-
- /**
- * 閿欒閲嶈瘯娆℃暟
- */
- private int failedSlaveReconnectionInterval;
-
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ユ睜鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int subscriptionConnectionMinimumIdleSize;
-
- /**
* 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
*/
private int subscriptionConnectionPoolSize;
-
- /**
- * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
- */
- private int subscriptionsPerConnection;
-
- /**
- * 鎵弿闂撮殧
- */
- private int scanInterval;
-
- /**
- * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
- */
- private int dnsMonitoringInterval;
/**
* 璇诲彇妯″紡
@@ -204,32 +131,6 @@
* 璁㈤槄妯″紡
*/
private SubscriptionMode subscriptionMode;
-
- }
-
- @Data
- @NoArgsConstructor
- public static class CacheGroup {
-
- /**
- * 缁刬d
- */
- private String groupId;
-
- /**
- * 缁勮繃鏈熸椂闂�
- */
- private long ttl;
-
- /**
- * 缁勬渶澶х┖闂叉椂闂�
- */
- private long maxIdleTime;
-
- /**
- * 缁勬渶澶ч暱搴�
- */
- private int maxSize;
}
--
Gitblit v1.9.3