From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/resources/application-dev.yml | 117 ++++++++++++++++++++--------------------------------------
1 files changed, 40 insertions(+), 77 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index eb6962f..015b302 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,4 +1,43 @@
-# 鏁版嵁婧愰厤缃�
+--- # 鐩戞帶閰嶇疆
+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
+
+--- # xxl-job 閰嶇疆
+xxl:
+ job:
+ # 鎵ц鍣ㄥ紑鍏�
+ enabled: true
+ # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
+ admin-addresses: http://localhost:9100/xxl-job-admin
+ # 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
+ access-token: xxl-job
+ # 鎵ц鍣ㄩ厤缃�
+ executor:
+ # 鎵ц鍣ˋppName锛氭墽琛屽櫒蹇冭烦娉ㄥ唽鍒嗙粍渚濇嵁锛涗负绌哄垯鍏抽棴鑷姩娉ㄥ唽
+ appname: xxl-job-executor
+ # 鎵ц鍣ㄧ鍙ｅ彿 鎵ц鍣ㄤ粠9101寮�濮嬪線鍚庡啓
+ port: 9101
+ # 鎵ц鍣ㄦ敞鍐岋細榛樿IP:PORT
+ address:
+ # 鎵ц鍣↖P锛氶粯璁よ嚜鍔ㄨ幏鍙朓P
+ ip:
+ # 鎵ц鍣ㄨ繍琛屾棩蹇楁枃浠跺瓨鍌ㄧ鐩樿矾寰�
+ logpath: ./logs/xxl-job
+ # 鎵ц鍣ㄦ棩蹇楁枃浠朵繚瀛樺ぉ鏁帮細澶т簬3鐢熸晥
+ logretentiondays: 30
+
+--- # 鏁版嵁婧愰厤缃�
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
@@ -117,79 +156,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"
-
---- # 鐩戞帶閰嶇疆
-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