From 32bfe334c0be11152b1789ddcc2d54b26daf342b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 21 十月 2021 18:41:56 +0800
Subject: [PATCH] update 整理删除无用注释 保证代码整洁
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 48 ++------
ruoyi-framework/pom.xml | 9 -
ruoyi-admin/src/main/resources/application-prod.yml | 61 ------------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java | 67 +++++++++++++
ruoyi-admin/src/main/resources/application.yml | 53 +---------
ruoyi-admin/src/main/resources/application-dev.yml | 62 ------------
6 files changed, 86 insertions(+), 214 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 867a1fd..c77d512 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -154,65 +154,3 @@
subscriptionsPerConnection: 5
# DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
dnsMonitoringInterval: 5000
-
-#--- # redis 闆嗙兢閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
-#spring:
-# redis:
-# cluster:
-# nodes:
-# - 192.168.0.100:6379
-# - 192.168.0.101:6379
-# - 192.168.0.102:6379
-# # 瀵嗙爜
-# password:
-# # 杩炴帴瓒呮椂鏃堕棿
-# timeout: 10s
-# # 鏄惁寮�鍚痵sl
-# ssl: false
-#
-#redisson:
-# # 绾跨▼姹犳暟閲�
-# threads: 16
-# # Netty绾跨▼姹犳暟閲�
-# nettyThreads: 32
-# # 浼犺緭妯″紡
-# transportMode: "NIO"
-# # 闆嗙兢閰嶇疆
-# clusterServersConfig:
-# # 瀹㈡埛绔悕绉�
-# clientName: ${ruoyi.name}
-# # master鏈�灏忕┖闂茶繛鎺ユ暟
-# masterConnectionMinimumIdleSize: 32
-# # master杩炴帴姹犲ぇ灏�
-# masterConnectionPoolSize: 64
-# # slave鏈�灏忕┖闂茶繛鎺ユ暟
-# slaveConnectionMinimumIdleSize: 32
-# # slave杩炴帴姹犲ぇ灏�
-# 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"
-# # 璁㈤槄妯″紡
-# subscriptionMode: "MASTER"
-
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index b66db3e..32ebb7c 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -154,64 +154,3 @@
subscriptionsPerConnection: 5
# DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
dnsMonitoringInterval: 5000
-
-#--- # redis 闆嗙兢閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
-#spring:
-# redis:
-# cluster:
-# nodes:
-# - 192.168.0.100:6379
-# - 192.168.0.101:6379
-# - 192.168.0.102:6379
-# # 瀵嗙爜
-# password:
-# # 杩炴帴瓒呮椂鏃堕棿
-# timeout: 10s
-# # 鏄惁寮�鍚痵sl
-# ssl: false
-#
-#redisson:
-# # 绾跨▼姹犳暟閲�
-# threads: 16
-# # Netty绾跨▼姹犳暟閲�
-# nettyThreads: 32
-# # 浼犺緭妯″紡
-# transportMode: "NIO"
-# # 闆嗙兢閰嶇疆
-# clusterServersConfig:
-# # 瀹㈡埛绔悕绉�
-# clientName: ${ruoyi.name}
-# # master鏈�灏忕┖闂茶繛鎺ユ暟
-# masterConnectionMinimumIdleSize: 32
-# # master杩炴帴姹犲ぇ灏�
-# masterConnectionPoolSize: 64
-# # slave鏈�灏忕┖闂茶繛鎺ユ暟
-# slaveConnectionMinimumIdleSize: 32
-# # slave杩炴帴姹犲ぇ灏�
-# 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"
-# # 璁㈤槄妯″紡
-# subscriptionMode: "MASTER"
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0b000c7..360c201 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -43,14 +43,6 @@
io: 8
# 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
worker: 256
-# # tomcat 閰嶇疆
-# tomcat:
-# # tomcat鐨刄RI缂栫爜
-# uri-encoding: UTF-8
-# # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
-# max-threads: 500
-# # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�25
-# min-spare-threads: 30
# 鏃ュ織閰嶇疆
logging:
@@ -147,43 +139,24 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
typeAliasesPackage: com.ruoyi.**.domain
- # 閽堝 typeAliasesPackage锛屽鏋滈厤缃簡璇ュ睘鎬э紝鍒欎粎浠呬細鎵弿璺緞涓嬩互璇ョ被浣滀负鐖剁被鐨勫煙瀵硅薄
- #typeAliasesSuperType: Class<?>
- # 濡傛灉閰嶇疆浜嗚灞炴�э紝SqlSessionFactoryBean 浼氭妸璇ュ寘涓嬮潰鐨勭被娉ㄥ唽涓哄搴旂殑 TypeHandler
- #typeHandlersPackage: null
- # 濡傛灉閰嶇疆浜嗚灞炴�э紝浼氬皢璺緞涓嬬殑鏋氫妇绫昏繘琛屾敞鍏ワ紝璁╁疄浣撶被瀛楁鑳藉绠�鍗曞揩鎹风殑浣跨敤鏋氫妇灞炴��
- #typeEnumsPackage: null
# 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
checkConfigLocation: false
# 閫氳繃璇ュ睘鎬у彲鎸囧畾 MyBatis 鐨勬墽琛屽櫒锛孧yBatis 鐨勬墽琛屽櫒鎬诲叡鏈変笁绉嶏細
- # SIMPLE锛氳鎵ц鍣ㄧ被鍨嬩笉鍋氱壒娈婄殑浜嬫儏锛屼负姣忎釜璇彞鐨勬墽琛屽垱寤轰竴涓柊鐨勯澶勭悊璇彞锛圥reparedStatement锛�
- # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
- # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
+ # SIMPLE锛氭瘡涓鍙ュ垱寤烘柊鐨勯澶勭悊鍣� REUSE锛氫細澶嶇敤棰勫鐞嗗櫒 BATCH锛氭壒閲忔墽琛屾墍鏈夌殑鏇存柊
executorType: SIMPLE
configuration:
# 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
- # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
mapUnderscoreToCamelCase: true
- # 榛樿鏋氫妇澶勭悊绫�,濡傛灉閰嶇疆浜嗚灞炴��,鏋氫妇灏嗙粺涓�浣跨敤鎸囧畾澶勭悊鍣ㄨ繘琛屽鐞�
- # org.apache.ibatis.type.EnumTypeHandler : 瀛樺偍鏋氫妇鐨勫悕绉�
- # org.apache.ibatis.type.EnumOrdinalTypeHandler : 瀛樺偍鏋氫妇鐨勭储寮�
- # com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 鏋氫妇绫婚渶瑕佸疄鐜癐Enum鎺ュ彛鎴栧瓧娈垫爣璁癅EnumValue娉ㄨВ.
- defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
# 褰撹缃负 true 鐨勬椂鍊欙紝鎳掑姞杞界殑瀵硅薄鍙兘琚换浣曟噿灞炴�у叏閮ㄥ姞杞斤紝鍚﹀垯锛屾瘡涓睘鎬ч兘鎸夐渶鍔犺浇銆傞渶瑕佸拰 lazyLoadingEnabled 涓�璧蜂娇鐢ㄣ��
aggressiveLazyLoading: true
# MyBatis 鑷姩鏄犲皠绛栫暐
- # NONE锛氫笉鍚敤鑷姩鏄犲皠
- # PARTIAL锛氬彧瀵归潪宓屽鐨� resultMap 杩涜鑷姩鏄犲皠
- # FULL锛氬鎵�鏈夌殑 resultMap 閮借繘琛岃嚜鍔ㄦ槧灏�
+ # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
autoMappingBehavior: PARTIAL
# MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
- # NONE锛氫笉鍋氫换浣曞鐞� (榛樿鍊�)
- # WARNING锛氫互鏃ュ織鐨勫舰寮忔墦鍗扮浉鍏宠鍛婁俊鎭�
- # FAILING锛氬綋浣滄槧灏勫け璐ュ鐞嗭紝骞舵姏鍑哄紓甯稿拰璇︾粏淇℃伅
+ # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
autoMappingUnknownColumnBehavior: NONE
# Mybatis涓�绾х紦瀛橈紝榛樿涓� SESSION
- # SESSION session绾у埆缂撳瓨锛屽悓涓�涓猻ession鐩稿悓鏌ヨ璇彞涓嶄細鍐嶆鏌ヨ鏁版嵁搴�
- # STATEMENT 鍏抽棴涓�绾х紦瀛�
+ # SESSION session绾у埆缂撳瓨 STATEMENT 鍏抽棴涓�绾х紦瀛�
localCacheScope: SESSION
# 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
cacheEnabled: false
@@ -198,32 +171,18 @@
enableSqlRunner: false
dbConfig:
# 涓婚敭绫诲瀷
- # AUTO 鏁版嵁搴揑D鑷
- # NONE 绌�
- # INPUT 鐢ㄦ埛杈撳叆ID
- # ASSIGN_ID 鍏ㄥ眬鍞竴ID
- # ASSIGN_UUID 鍏ㄥ眬鍞竴ID UUID
+ # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
idType: AUTO
- # 琛ㄥ悕鍓嶇紑
- tablePrefix: null
- # 瀛楁 format,渚�: %s,(瀵逛富閿棤鏁�)
- columnFormat: null
# 琛ㄥ悕鏄惁浣跨敤椹煎嘲杞笅鍒掔嚎鍛藉悕,鍙琛ㄥ悕鐢熸晥
tableUnderline: true
# 澶у啓鍛藉悕,瀵硅〃鍚嶅拰瀛楁鍚嶅潎鐢熸晥
capitalMode: false
- # 鍏ㄥ眬鐨別ntity鐨勯�昏緫鍒犻櫎瀛楁灞炴�у悕
- logicDeleteField: null
# 閫昏緫宸插垹闄ゅ��
logicDeleteValue: 2
# 閫昏緫鏈垹闄ゅ��
logicNotDeleteValue: 0
# 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
- # IGNORED 蹇界暐鍒ゆ柇
- # NOT_NULL 闈濶ULL鍒ゆ柇
- # NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
- # DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
- # NEVER 涓嶅姞鍏� SQL
+ # IGNORED 蹇界暐 NOT_NULL 闈濶ULL NOT_EMPTY 闈炵┖ DEFAULT 榛樿 NEVER 涓嶅姞鍏� SQL
insertStrategy: NOT_NULL
# 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
updateStrategy: NOT_NULL
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 20176a0..f80c264 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -17,7 +17,6 @@
<dependencies>
- <!-- BEGIN 濡傛灉鎯充娇鐢� Tomcat 娉ㄩ噴鎺変互涓嬩唬鐮� -->
<!-- SpringBoot Web瀹瑰櫒 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -34,14 +33,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
- <!-- END -->
-
- <!-- BEGIN 濡傛灉鎯充娇鐢� Tomcat 瑙ｉ櫎浠ヤ笅浠ｇ爜娉ㄩ噴 -->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-starter-web</artifactId>-->
-<!-- </dependency>-->
- <!-- END -->
<!-- SpringBoot 鎷︽埅鍣� -->
<dependency>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
index 57388ec..db81b74 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -18,13 +18,12 @@
import java.util.List;
/**
- * mybatis-plus閰嶇疆绫�
+ * mybatis-plus閰嶇疆绫�(涓嬫柟娉ㄩ噴鏈夋彃浠朵粙缁�)
*
* @author Lion Li
*/
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
-// 鎸囧畾瑕佹壂鎻忕殑Mapper绫荤殑鍖呯殑璺緞
@MapperScan("${mybatis-plus.mapperPackage}")
public class MybatisPlusConfig {
@@ -35,14 +34,11 @@
interceptor.addInnerInterceptor(paginationInnerInterceptor());
// 涔愯閿佹彃浠�
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
- // 闃绘柇鎻掍欢
-// interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
return interceptor;
}
/**
* 鍒嗛〉鎻掍欢锛岃嚜鍔ㄨ瘑鍒暟鎹簱绫诲瀷
- * https://baomidou.com/guide/interceptor-pagination.html
*/
public PaginationInnerInterceptor paginationInnerInterceptor() {
PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
@@ -55,41 +51,13 @@
/**
* 涔愯閿佹彃浠�
- * https://baomidou.com/guide/interceptor-optimistic-locker.html
*/
public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
return new OptimisticLockerInnerInterceptor();
}
/**
- * 濡傛灉鏄鍏ㄨ〃鐨勫垹闄ゆ垨鏇存柊鎿嶄綔锛屽氨浼氱粓姝㈣鎿嶄綔
- * https://baomidou.com/guide/interceptor-block-attack.html
- */
-// public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
-// return new BlockAttackInnerInterceptor();
-// }
-
- /**
- * sql鎬ц兘瑙勮寖鎻掍欢(鍨冨溇SQL鎷︽埅)
- * 濡傛湁闇�瑕佸彲浠ュ惎鐢�
- */
-// public IllegalSQLInnerInterceptor illegalSQLInnerInterceptor() {
-// return new IllegalSQLInnerInterceptor();
-// }
-
-
- /**
- * 鑷畾涔変富閿瓥鐣�
- * https://baomidou.com/guide/id-generator.html
- */
-// @Bean
-// public IdentifierGenerator idGenerator() {
-// return new CustomIdGenerator();
-// }
-
- /**
* 鍏冨璞″瓧娈靛～鍏呮帶鍒跺櫒
- * https://baomidou.com/guide/auto-fill-metainfo.html
*/
@Bean
public MetaObjectHandler metaObjectHandler() {
@@ -98,7 +66,6 @@
/**
* sql娉ㄥ叆鍣ㄩ厤缃�
- * https://baomidou.com/guide/sql-injector.html
*/
@Bean
public ISqlInjector sqlInjector() {
@@ -113,6 +80,19 @@
}
/**
+ * PaginationInnerInterceptor 鍒嗛〉鎻掍欢锛岃嚜鍔ㄨ瘑鍒暟鎹簱绫诲瀷
+ * https://baomidou.com/guide/interceptor-pagination.html
+ * OptimisticLockerInnerInterceptor 涔愯閿佹彃浠�
+ * https://baomidou.com/guide/interceptor-optimistic-locker.html
+ * MetaObjectHandler 鍏冨璞″瓧娈靛～鍏呮帶鍒跺櫒
+ * https://baomidou.com/guide/auto-fill-metainfo.html
+ * ISqlInjector sql娉ㄥ叆鍣�
+ * https://baomidou.com/guide/sql-injector.html
+ * BlockAttackInnerInterceptor 濡傛灉鏄鍏ㄨ〃鐨勫垹闄ゆ垨鏇存柊鎿嶄綔锛屽氨浼氱粓姝㈣鎿嶄綔
+ * https://baomidou.com/guide/interceptor-block-attack.html
+ * IllegalSQLInnerInterceptor sql鎬ц兘瑙勮寖鎻掍欢(鍨冨溇SQL鎷︽埅)
+ * IdentifierGenerator 鑷畾涔変富閿瓥鐣�
+ * https://baomidou.com/guide/id-generator.html
* TenantLineInnerInterceptor 澶氱鎴锋彃浠�
* https://baomidou.com/guide/interceptor-tenant-line.html
* DynamicTableNameInnerInterceptor 鍔ㄦ�佽〃鍚嶆彃浠�
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 c1c303a..d7ae1cd 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
@@ -76,7 +76,7 @@
.setConnectionPoolSize(singleServerConfig.getConnectionPoolSize())
.setDnsMonitoringInterval(singleServerConfig.getDnsMonitoringInterval());
}
-
+ // 闆嗙兢閰嶇疆鏂瑰紡 鍙傝�冧笅鏂规敞閲�
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
if (ObjectUtil.isNotNull(clusterServersConfig)) {
// 浣跨敤闆嗙兢妯″紡
@@ -123,4 +123,69 @@
return new RedissonSpringCacheManager(redissonClient, config, JsonJacksonCodec.INSTANCE);
}
+ /**
+ * redis闆嗙兢閰嶇疆 yml
+ *
+ * --- # redis 闆嗙兢閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
+ * spring:
+ * redis:
+ * cluster:
+ * nodes:
+ * - 192.168.0.100:6379
+ * - 192.168.0.101:6379
+ * - 192.168.0.102:6379
+ * # 瀵嗙爜
+ * password:
+ * # 杩炴帴瓒呮椂鏃堕棿
+ * timeout: 10s
+ * # 鏄惁寮�鍚痵sl
+ * ssl: false
+ *
+ * redisson:
+ * # 绾跨▼姹犳暟閲�
+ * threads: 16
+ * # Netty绾跨▼姹犳暟閲�
+ * nettyThreads: 32
+ * # 浼犺緭妯″紡
+ * transportMode: "NIO"
+ * # 闆嗙兢閰嶇疆
+ * clusterServersConfig:
+ * # 瀹㈡埛绔悕绉�
+ * clientName: ${ruoyi.name}
+ * # master鏈�灏忕┖闂茶繛鎺ユ暟
+ * masterConnectionMinimumIdleSize: 32
+ * # master杩炴帴姹犲ぇ灏�
+ * masterConnectionPoolSize: 64
+ * # slave鏈�灏忕┖闂茶繛鎺ユ暟
+ * slaveConnectionMinimumIdleSize: 32
+ * # slave杩炴帴姹犲ぇ灏�
+ * 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"
+ * # 璁㈤槄妯″紡
+ * subscriptionMode: "MASTER"
+ */
+
}
--
Gitblit v1.9.3