From 426aeb0a7f14c62da224d51615903f746e56b9dd Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 07 六月 2022 11:04:43 +0800 Subject: [PATCH] 发布 4.2.0-beta1 公测版 --- ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java | 295 ++++++++++++++++++++++------------------------------------ 1 files changed, 112 insertions(+), 183 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 4516da2..cd320eb 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,7 +4,6 @@ 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; @@ -20,217 +19,147 @@ @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 SingleServerConfig singleServerConfig; - /** - * 鍗曟満鏈嶅姟閰嶇疆 - */ - private SingleServerConfig singleServerConfig; + /** + * 闆嗙兢鏈嶅姟閰嶇疆 + */ + private ClusterServersConfig clusterServersConfig; - /** - * 闆嗙兢鏈嶅姟閰嶇疆 - */ - private ClusterServersConfig clusterServersConfig; + /** + * 缂撳瓨缁� + */ + private List<CacheGroup> cacheGroup; - /** - * 缂撳瓨缁� - */ - private List<CacheGroup> cacheGroup; + @Data + @NoArgsConstructor + public static class SingleServerConfig { - @Data - @NoArgsConstructor - public static class SingleServerConfig { + /** + * 瀹㈡埛绔悕绉� + */ + private String clientName; - /** - * 瀹㈡埛绔悕绉� - */ - private String clientName; + /** + * 鏈�灏忕┖闂茶繛鎺ユ暟 + */ + private int connectionMinimumIdleSize; - /** - * 鏈�灏忕┖闂茶繛鎺ユ暟 - */ - private int connectionMinimumIdleSize; + /** + * 杩炴帴姹犲ぇ灏� + */ + private int connectionPoolSize; - /** - * 杩炴帴姹犲ぇ灏� - */ - private int connectionPoolSize; + /** + * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 + */ + private int idleConnectionTimeout; - /** - * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 - */ - private int idleConnectionTimeout; + /** + * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 + */ + private int timeout; - /** - * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 - */ - private int timeout; + /** + * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 + */ + private int subscriptionConnectionPoolSize; - /** - * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆� - */ - private int retryAttempts; + } - /** - * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� - */ - private int retryInterval; + @Data + @NoArgsConstructor + public static class ClusterServersConfig { - /** - * 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟 - */ - private int subscriptionConnectionMinimumIdleSize; + /** + * 瀹㈡埛绔悕绉� + */ + private String clientName; - /** - * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 - */ - private int subscriptionConnectionPoolSize; + /** + * master鏈�灏忕┖闂茶繛鎺ユ暟 + */ + private int masterConnectionMinimumIdleSize; - /** - * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲� - */ - private int subscriptionsPerConnection; + /** + * master杩炴帴姹犲ぇ灏� + */ + private int masterConnectionPoolSize; - /** - * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 - */ - private int dnsMonitoringInterval; + /** + * slave鏈�灏忕┖闂茶繛鎺ユ暟 + */ + private int slaveConnectionMinimumIdleSize; - } + /** + * slave杩炴帴姹犲ぇ灏� + */ + private int slaveConnectionPoolSize; - @Data - @NoArgsConstructor - public static class ClusterServersConfig { + /** + * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 + */ + private int idleConnectionTimeout; - /** - * 瀹㈡埛绔悕绉� - */ - private String clientName; + /** + * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 + */ + private int timeout; - /** - * master鏈�灏忕┖闂茶繛鎺ユ暟 - */ - private int masterConnectionMinimumIdleSize; + /** + * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 + */ + private int subscriptionConnectionPoolSize; - /** - * master杩炴帴姹犲ぇ灏� - */ - private int masterConnectionPoolSize; + /** + * 璇诲彇妯″紡 + */ + private ReadMode readMode; - /** - * slave鏈�灏忕┖闂茶繛鎺ユ暟 - */ - private int slaveConnectionMinimumIdleSize; + /** + * 璁㈤槄妯″紡 + */ + private SubscriptionMode subscriptionMode; - /** - * slave杩炴帴姹犲ぇ灏� - */ - private int slaveConnectionPoolSize; + } - /** - * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 - */ - private int idleConnectionTimeout; + @Data + @NoArgsConstructor + public static class CacheGroup { - /** - * ping瓒呮椂 - */ - private int pingConnectionInterval; + /** + * 缁刬d + */ + private String groupId; - /** - * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 - */ - private int timeout; + /** + * 缁勮繃鏈熸椂闂� + */ + private long ttl; - /** - * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆� - */ - private int retryAttempts; + /** + * 缁勬渶澶х┖闂叉椂闂� + */ + private long maxIdleTime; - /** - * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� - */ - private int retryInterval; + /** + * 缁勬渶澶ч暱搴� + */ + private int maxSize; - /** - * 閿欒閲嶈瘯娆℃暟 - */ - 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