From aaa15b403a89490a33a45d68c8b7cfa34d87b175 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 20 十月 2021 13:22:45 +0800 Subject: [PATCH] add [重大更新]增加 ruoyi-job 任务调度模块(基于xxl-job) --- ruoyi-admin/src/main/resources/application-prod.yml | 184 ++++++++++++++++++++++++++++++++------------- 1 files changed, 131 insertions(+), 53 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 2c9d4e5..b66db3e 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -1,12 +1,49 @@ -# 鏁版嵁婧愰厤缃� +--- # 鐩戞帶閰嶇疆 spring: - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + boot: + admin: + # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆 + client: + # 澧炲姞瀹㈡埛绔紑鍏� + enabled: true + # 璁剧疆 Spring Boot Admin Server 鍦板潃 + url: http://172.30.0.90:9090/admin + instance: + prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP + username: ruoyi + password: 123456 + +--- # xxl-job 閰嶇疆 +xxl: + job: + # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆� + admin-addresses: http://172.30.0.92:9100/xxl-job-admin + # 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤 + access-token: xxl-job + # 鎵ц鍣ㄩ厤缃� + executor: + # 鎵ц鍣ˋppName锛氭墽琛屽櫒蹇冭烦娉ㄥ唽鍒嗙粍渚濇嵁锛涗负绌哄垯鍏抽棴鑷姩娉ㄥ唽 + appname: xxl-job-executor + # 鎵ц鍣ㄧ鍙e彿 鎵ц鍣ㄤ粠9101寮�濮嬪線鍚庡啓 + port: 9101 + # 鎵ц鍣ㄦ敞鍐岋細榛樿IP:PORT + address: + # 鎵ц鍣↖P锛氶粯璁よ嚜鍔ㄨ幏鍙朓P + ip: + # 鎵ц鍣ㄨ繍琛屾棩蹇楁枃浠跺瓨鍌ㄧ鐩樿矾寰� + logpath: ./logs/xxl-job + # 鎵ц鍣ㄦ棩蹇楁枃浠朵繚瀛樺ぉ鏁帮細澶т簬3鐢熸晥 + logretentiondays: 30 + +--- # 鏁版嵁婧愰厤缃� +spring: datasource: type: com.alibaba.druid.pool.DruidDataSource # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: - #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master + # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�) + p6spy: false + # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master primary: master datasource: # 涓诲簱鏁版嵁婧� @@ -17,32 +54,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: @@ -63,7 +106,9 @@ wall: config: multi-statement-allow: true - # redis 閰嶇疆 + +--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀) +spring: redis: # 鍦板潃 host: 172.30.0.48 @@ -78,7 +123,6 @@ # 鏄惁寮�鍚痵sl ssl: false ---- # redisson 瀹㈡埛绔厤缃� redisson: # 绾跨▼姹犳暟閲� threads: 16 @@ -111,29 +155,63 @@ # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 dnsMonitoringInterval: 5000 ---- # 鐩戞帶閰嶇疆 -spring: - boot: - admin: - # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆 - client: - # 璁剧疆 Spring Boot Admin Server 鍦板潃 - url: http://172.30.0.90: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: health,info - endpoint: - logfile: - external-file: ./logs/sys-console.log +#--- # 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