From dc5e5c6c08d4f9b9a2f69fc73a4704665871cc1e Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 16 三月 2022 14:07:46 +0800 Subject: [PATCH] add 增加 postgres sqlserver jdbc连接适配 --- ruoyi-admin/src/main/resources/application-dev.yml | 136 +++++++++++++++++++++++++++++++++------------ 1 files changed, 99 insertions(+), 37 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 75093f7..4f3fca1 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,45 +1,112 @@ -# 鏁版嵁婧愰厤缃� +--- # 鐩戞帶閰嶇疆 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://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 + # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: + # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�) + p6spy: true + # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master + primary: master datasource: # 涓诲簱鏁版嵁婧� 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 # 浠庡簱鏁版嵁婧� slave: + lazy: true driverClassName: com.mysql.cj.jdbc.Driver 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 +# postgres: +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true +# username: SA +# password: root + druid: + # 鍒濆杩炴帴鏁� + initialSize: 5 + # 鏈�灏忚繛鎺ユ睜鏁伴噺 + minIdle: 10 + # 鏈�澶ц繛鎺ユ睜鏁伴噺 + maxActive: 20 + # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� + maxWait: 60000 + # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 + timeBetweenEvictionRunsMillis: 60000 + # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 + minEvictableIdleTimeMillis: 300000 + # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 + maxEvictableIdleTimeMillis: 900000 + # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁� + validationQuery: SELECT 1 + 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 +127,9 @@ wall: config: multi-statement-allow: true - # redis 閰嶇疆 + +--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀) +spring: redis: # 鍦板潃 host: localhost @@ -75,12 +144,11 @@ # 鏄惁寮�鍚痵sl ssl: false ---- # redisson 瀹㈡埛绔厤缃� redisson: # 绾跨▼姹犳暟閲� - threads: 16 + threads: 4 # Netty绾跨▼姹犳暟閲� - nettyThreads: 32 + nettyThreads: 8 # 浼犺緭妯″紡 transportMode: "NIO" # 鍗曡妭鐐归厤缃� @@ -88,9 +156,9 @@ # 瀹㈡埛绔悕绉� clientName: ${ruoyi.name} # 鏈�灏忕┖闂茶繛鎺ユ暟 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 杩炴帴姹犲ぇ灏� - connectionPoolSize: 64 + connectionPoolSize: 32 # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 idleConnectionTimeout: 10000 # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 @@ -99,11 +167,5 @@ retryAttempts: 3 # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� retryInterval: 1500 - # 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟 - subscriptionConnectionMinimumIdleSize: 1 # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 subscriptionConnectionPoolSize: 50 - # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲� - subscriptionsPerConnection: 5 - # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 - dnsMonitoringInterval: 5000 -- Gitblit v1.9.3