From 1a19c3b3a5e5f5d1766c08fe7d8258bb6d9a138a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 16 三月 2022 14:05:29 +0800 Subject: [PATCH] update 单独指定oracle心跳检查 --- ruoyi-admin/src/main/resources/application-dev.yml | 144 ++++++++++++++++++----------------------------- 1 files changed, 55 insertions(+), 89 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index eb6962f..8c7b490 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: + service-host-type: 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 + # 鎵ц鍣ㄧ鍙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 @@ -12,7 +51,9 @@ # 涓诲簱鏁版嵁婧� master: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + # jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂) + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true username: root password: root # 浠庡簱鏁版嵁婧� @@ -22,6 +63,13 @@ url: username: password: +# oracle: +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# druid: +# validationQuery: SELECT 1 FROM DUAL druid: # 鍒濆杩炴帴鏁� initialSize: 5 @@ -38,7 +86,7 @@ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 maxEvictableIdleTimeMillis: 900000 # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁� - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -88,9 +136,9 @@ redisson: # 绾跨▼姹犳暟閲� - threads: 16 + threads: 4 # Netty绾跨▼姹犳暟閲� - nettyThreads: 32 + nettyThreads: 8 # 浼犺緭妯″紡 transportMode: "NIO" # 鍗曡妭鐐归厤缃� @@ -98,9 +146,9 @@ # 瀹㈡埛绔悕绉� clientName: ${ruoyi.name} # 鏈�灏忕┖闂茶繛鎺ユ暟 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 杩炴帴姹犲ぇ灏� - connectionPoolSize: 64 + connectionPoolSize: 32 # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 idleConnectionTimeout: 10000 # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 @@ -109,87 +157,5 @@ retryAttempts: 3 # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� retryInterval: 1500 - # 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟 - subscriptionConnectionMinimumIdleSize: 1 # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 subscriptionConnectionPoolSize: 50 - # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲� - 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