From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java | 265 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 200 insertions(+), 65 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 99db89e..0b9024d 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
@@ -2,10 +2,13 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.redisson.client.codec.Codec;
+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 閰嶇疆灞炴��
@@ -17,85 +20,217 @@
@ConfigurationProperties(prefix = "redisson")
public class RedissonProperties {
- /**
- * 绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
- */
- private int threads;
+ /**
+ * 绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
+ */
+ private int threads;
- /**
- * Netty绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
- */
- private int nettyThreads;
+ /**
+ * Netty绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
+ */
+ private int nettyThreads;
- /**
- * 浼犺緭妯″紡
- */
- private TransportMode transportMode;
+ /**
+ * 浼犺緭妯″紡
+ */
+ private TransportMode transportMode;
- /**
- * 鍗曟満鏈嶅姟閰嶇疆
- */
- private SingleServerConfig singleServerConfig;
+ /**
+ * 鍗曟満鏈嶅姟閰嶇疆
+ */
+ private SingleServerConfig singleServerConfig;
- @Data
- @NoArgsConstructor
- public static class SingleServerConfig {
+ /**
+ * 闆嗙兢鏈嶅姟閰嶇疆
+ */
+ private ClusterServersConfig clusterServersConfig;
- /**
- * 瀹㈡埛绔悕绉�
- */
- private String clientName;
+ /**
+ * 缂撳瓨缁�
+ */
+ private List<CacheGroup> cacheGroup;
- /**
- * 鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int connectionMinimumIdleSize;
+ @Data
+ @NoArgsConstructor
+ public static class SingleServerConfig {
- /**
- * 杩炴帴姹犲ぇ灏�
- */
- private int connectionPoolSize;
+ /**
+ * 瀹㈡埛绔悕绉�
+ */
+ private String clientName;
- /**
- * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
- */
- private int idleConnectionTimeout;
+ /**
+ * 鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int connectionMinimumIdleSize;
- /**
- * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
- */
- private int timeout;
+ /**
+ * 杩炴帴姹犲ぇ灏�
+ */
+ private int connectionPoolSize;
- /**
- * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
- */
- private int retryAttempts;
+ /**
+ * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int idleConnectionTimeout;
- /**
- * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
- */
- private int retryInterval;
+ /**
+ * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int timeout;
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int subscriptionConnectionMinimumIdleSize;
+ /**
+ * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
+ */
+ private int retryAttempts;
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
- */
- private int subscriptionConnectionPoolSize;
+ /**
+ * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
+ */
+ private int retryInterval;
- /**
- * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
- */
- private int subscriptionsPerConnection;
+ /**
+ * 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int subscriptionConnectionMinimumIdleSize;
- /**
- * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
- */
- private int dnsMonitoringInterval;
+ /**
+ * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
+ */
+ private int subscriptionConnectionPoolSize;
- }
+ /**
+ * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
+ */
+ private int subscriptionsPerConnection;
+
+ /**
+ * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
+ */
+ private int dnsMonitoringInterval;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class ClusterServersConfig {
+
+ /**
+ * 瀹㈡埛绔悕绉�
+ */
+ private String clientName;
+
+ /**
+ * master鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int masterConnectionMinimumIdleSize;
+
+ /**
+ * master杩炴帴姹犲ぇ灏�
+ */
+ private int masterConnectionPoolSize;
+
+ /**
+ * slave鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int slaveConnectionMinimumIdleSize;
+
+ /**
+ * slave杩炴帴姹犲ぇ灏�
+ */
+ private int slaveConnectionPoolSize;
+
+ /**
+ * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
+ */
+ 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;
+
+ /**
+ * 璇诲彇妯″紡
+ */
+ private ReadMode readMode;
+
+ /**
+ * 璁㈤槄妯″紡
+ */
+ 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