From b082da73a1e0259738ccb33ebf7d80cad3dc3a10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/resources/application-dev.yml | 129 ++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 56 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5effcea..eb6962f 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -4,7 +4,9 @@
type: com.alibaba.druid.pool.DruidDataSource
# 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
dynamic:
- #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
+ # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�)
+ p6spy: true
+ # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
primary: master
datasource:
# 涓诲簱鏁版嵁婧�
@@ -42,6 +44,10 @@
testOnReturn: false
# 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
filters: stat
+
+--- # druid 閰嶇疆
+spring:
+ datasource:
druid:
webStatFilter:
enabled: true
@@ -63,7 +69,9 @@
wall:
config:
multi-statement-allow: true
- # redis 閰嶇疆
+
+--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
+spring:
redis:
# 鍦板潃
host: localhost
@@ -78,7 +86,6 @@
# 鏄惁寮�鍚痵sl
ssl: false
---- # redisson 瀹㈡埛绔厤缃�
redisson:
# 绾跨▼姹犳暟閲�
threads: 16
@@ -111,68 +118,78 @@
# 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
-
-# Actuator 鐩戞帶绔偣鐨勯厤缃」
-management:
- endpoints:
- web:
- # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
- base-path: /actuator
- exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: '*'
- endpoint:
- logfile:
- external-file: ./logs/sys-console.log
-
---- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�)
-cloud-storage:
- # minio閰嶇疆
- minio:
- endpoint: http://localhost:9000
- accessKey: ruoyi
- secretKey: ruoyi123
- bucketName: ruoyi
- # 涓冪墰浜戦厤缃�
- qiniu:
- domain: http://XXX.XXXX.com
- prefix:
- accessKey: XXXXXXXXXXXXXXX
- secretKey: XXXXXXXXXXXXXXX
- bucketName: ruoyi
- isHttps: false
- # z0 鍗庝笢 z1 鍗庡寳 z2 鍗庡崡 na0 鍖楃編 as0 涓滃崡浜�
- # 涓嶅～涓鸿嚜鍔ㄨ幏鍙�(鎬ц兘浣� 鏄撳嚭闂)
- region: z0
- # 闃块噷浜戦厤缃�
- aliyun:
- endpoint: http://oss-cn-beijing.aliyuncs.com
- prefix:
- accessKeyId: XXXXXXXXXXXXXXX
- accessKeySecret: XXXXXXXXXXXXXXX
- bucketName: ruoyi
- # 鑵捐浜戦厤缃�
- qcloud:
- endpoint: http://cos.ap-beijing.myqcloud.com
- prefix:
- secretId: XXXXXXXXXXXXXXX
- secretKey: XXXXXXXXXXXXXXX
- # 鑵捐浜慴ucket鍚嶈鍒� 鏍煎紡涓� BucketName-APPID 姝ゅ濉啓鐨勫瓨鍌ㄦ《鍚嶇О蹇呴』涓烘鏍煎紡
- bucketName: ruoyi-1250000000
- isHttps: false
- # 鍦板煙鍚嶅弬鑰冨畼鏂规枃妗�
- # https://cloud.tencent.com/document/product/436/6224
- region: ap-beijing
--
Gitblit v1.9.3