From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java | 168 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 66 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..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
@@ -2,8 +2,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.redisson.client.codec.Codec;
-import org.redisson.config.TransportMode;
+import org.redisson.config.ReadMode;
+import org.redisson.config.SubscriptionMode;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -17,85 +17,121 @@
@ConfigurationProperties(prefix = "redisson")
public class RedissonProperties {
- /**
- * 绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
- */
- private int threads;
+ /**
+ * redis缂撳瓨key鍓嶇紑
+ */
+ private String keyPrefix;
- /**
- * Netty绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
- */
- private int nettyThreads;
+ /**
+ * 绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
+ */
+ private int threads;
- /**
- * 浼犺緭妯″紡
- */
- private TransportMode transportMode;
+ /**
+ * Netty绾跨▼姹犳暟閲�,榛樿鍊� = 褰撳墠澶勭悊鏍告暟閲� * 2
+ */
+ private int nettyThreads;
- /**
- * 鍗曟満鏈嶅姟閰嶇疆
- */
- private SingleServerConfig singleServerConfig;
+ /**
+ * 鍗曟満鏈嶅姟閰嶇疆
+ */
+ private SingleServerConfig singleServerConfig;
- @Data
- @NoArgsConstructor
- public static class SingleServerConfig {
+ /**
+ * 闆嗙兢鏈嶅姟閰嶇疆
+ */
+ private ClusterServersConfig clusterServersConfig;
- /**
- * 瀹㈡埛绔悕绉�
- */
- private String clientName;
+ @Data
+ @NoArgsConstructor
+ public static class SingleServerConfig {
- /**
- * 鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int connectionMinimumIdleSize;
+ /**
+ * 瀹㈡埛绔悕绉�
+ */
+ private String clientName;
- /**
- * 杩炴帴姹犲ぇ灏�
- */
- private int connectionPoolSize;
+ /**
+ * 鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int connectionMinimumIdleSize;
- /**
- * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
- */
- private int idleConnectionTimeout;
+ /**
+ * 杩炴帴姹犲ぇ灏�
+ */
+ private int connectionPoolSize;
- /**
- * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
- */
- private int timeout;
+ /**
+ * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int idleConnectionTimeout;
- /**
- * 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
- */
- private int retryAttempts;
+ /**
+ * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int timeout;
- /**
- * 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
- */
- private int retryInterval;
+ /**
+ * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
+ */
+ private int subscriptionConnectionPoolSize;
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟
- */
- private int subscriptionConnectionMinimumIdleSize;
+ }
- /**
- * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
- */
- private int subscriptionConnectionPoolSize;
+ @Data
+ @NoArgsConstructor
+ public static class ClusterServersConfig {
- /**
- * 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
- */
- private int subscriptionsPerConnection;
+ /**
+ * 瀹㈡埛绔悕绉�
+ */
+ private String clientName;
- /**
- * DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
- */
- private int dnsMonitoringInterval;
+ /**
+ * master鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int masterConnectionMinimumIdleSize;
- }
+ /**
+ * master杩炴帴姹犲ぇ灏�
+ */
+ private int masterConnectionPoolSize;
+
+ /**
+ * slave鏈�灏忕┖闂茶繛鎺ユ暟
+ */
+ private int slaveConnectionMinimumIdleSize;
+
+ /**
+ * slave杩炴帴姹犲ぇ灏�
+ */
+ private int slaveConnectionPoolSize;
+
+ /**
+ * 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int idleConnectionTimeout;
+
+ /**
+ * 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
+ */
+ private int timeout;
+
+ /**
+ * 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
+ */
+ private int subscriptionConnectionPoolSize;
+
+ /**
+ * 璇诲彇妯″紡
+ */
+ private ReadMode readMode;
+
+ /**
+ * 璁㈤槄妯″紡
+ */
+ private SubscriptionMode subscriptionMode;
+
+ }
}
--
Gitblit v1.9.3