From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架
---
ruoyi-admin/src/main/resources/application-dev.yml | 136 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 111 insertions(+), 25 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 75093f7..eb6962f 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,10 +1,13 @@
# 鏁版嵁婧愰厤缃�
spring:
- autoconfigure:
- exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
type: com.alibaba.druid.pool.DruidDataSource
+ # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
dynamic:
+ # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�)
+ p6spy: true
+ # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
+ primary: master
datasource:
# 涓诲簱鏁版嵁婧�
master:
@@ -14,32 +17,38 @@
password: root
# 浠庡簱鏁版嵁婧�
slave:
+ lazy: true
driverClassName: com.mysql.cj.jdbc.Driver
url:
username:
password:
+ druid:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ # 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
+ filters: stat
+
+--- # druid 閰嶇疆
+spring:
+ datasource:
druid:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- # 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
- filters: stat
webStatFilter:
enabled: true
statViewServlet:
@@ -60,7 +69,9 @@
wall:
config:
multi-statement-allow: true
- # redis 閰嶇疆
+
+--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
+spring:
redis:
# 鍦板潃
host: localhost
@@ -75,7 +86,6 @@
# 鏄惁寮�鍚痵sl
ssl: false
---- # redisson 瀹㈡埛绔厤缃�
redisson:
# 绾跨▼姹犳暟閲�
threads: 16
@@ -107,3 +117,79 @@
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"
+
+--- # 鐩戞帶閰嶇疆
+spring:
+ boot:
+ admin:
+ # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
+ client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
+ # 璁剧疆 Spring Boot Admin Server 鍦板潃
+ url: http://localhost:9090/admin
+ instance:
+ prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
+ username: ruoyi
+ password: 123456
--
Gitblit v1.9.3