From ce7536df9f82833044c9cbc479f0de42de2beffe Mon Sep 17 00:00:00 2001 From: 抓蛙师 <770492966@qq.com> Date: 星期四, 14 七月 2022 19:15:17 +0800 Subject: [PATCH] !201 redission处理增加前缀 * redission处理判断无前缀则不处理 * redission处理增加前缀 --- ruoyi-admin/src/main/resources/application-dev.yml | 194 ++++++++++++++++++++++++++++------------------- 1 files changed, 115 insertions(+), 79 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 015b302..88bc3a6 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,41 +1,34 @@ ---- # 鐩戞帶閰嶇疆 -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 +--- # 鐩戞帶涓績閰嶇疆 +spring.boot.admin.client: + # 澧炲姞瀹㈡埛绔紑鍏� + enabled: true + 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 +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: @@ -47,11 +40,15 @@ p6spy: true # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master primary: master + # 涓ユ牸妯″紡 鍖归厤涓嶅埌鏁版嵁婧愬垯鎶ラ敊 + strict: true 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 # 浠庡簱鏁版嵁婧� @@ -61,6 +58,23 @@ 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 @@ -77,7 +91,7 @@ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣 maxEvictableIdleTimeMillis: 900000 # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁� - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -85,29 +99,27 @@ filters: stat --- # druid 閰嶇疆 -spring: - datasource: - druid: - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 璁剧疆鐧藉悕鍗曪紝涓嶅~鍒欏厑璁告墍鏈夎闂� - allow: - url-pattern: /druid/* - # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮� - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 鎱QL璁板綍 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true +spring.datasource.druid: + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 璁剧疆鐧藉悕鍗曪紝涓嶅~鍒欏厑璁告墍鏈夎闂� + allow: + url-pattern: /druid/* + # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮� + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 鎱QL璁板綍 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true --- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀) spring: @@ -118,41 +130,65 @@ port: 6379 # 鏁版嵁搴撶储寮� database: 0 - # 瀵嗙爜 - password: + # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�) + # password: # 杩炴帴瓒呮椂鏃堕棿 timeout: 10s # 鏄惁寮�鍚痵sl ssl: false redisson: + # redis key鍓嶇紑 + keyPrefix: # 绾跨▼姹犳暟閲� - threads: 16 + threads: 4 # Netty绾跨▼姹犳暟閲� - nettyThreads: 32 - # 浼犺緭妯″紡 - transportMode: "NIO" + nettyThreads: 8 # 鍗曡妭鐐归厤缃� singleServerConfig: # 瀹㈡埛绔悕绉� clientName: ${ruoyi.name} # 鏈�灏忕┖闂茶繛鎺ユ暟 - connectionMinimumIdleSize: 32 + connectionMinimumIdleSize: 8 # 杩炴帴姹犲ぇ灏� - connectionPoolSize: 64 + connectionPoolSize: 32 # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣 idleConnectionTimeout: 10000 # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣 timeout: 3000 - # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆� - retryAttempts: 3 - # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉� - retryInterval: 1500 - # 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟 - subscriptionConnectionMinimumIdleSize: 1 # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬 subscriptionConnectionPoolSize: 50 - # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲� - subscriptionsPerConnection: 5 - # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 - dnsMonitoringInterval: 5000 + +--- # mail 閭欢鍙戦�� +mail: + enabled: false + host: smtp.163.com + port: 465 + # 鏄惁闇�瑕佺敤鎴峰悕瀵嗙爜楠岃瘉 + auth: true + # 鍙戦�佹柟锛岄伒寰猂FC-822鏍囧噯 + from: xxx@163.com + # 鐢ㄦ埛鍚嶏紙娉ㄦ剰锛氬鏋滀娇鐢╢oxmail閭锛屾澶剈ser涓簈q鍙凤級 + user: xxx@163.com + # 瀵嗙爜锛堟敞鎰忥紝鏌愪簺閭闇�瑕佷负SMTP鏈嶅姟鍗曠嫭璁剧疆瀵嗙爜锛岃鎯呮煡鐪嬬浉鍏冲府鍔╋級 + pass: xxxxxxxxxx + # 浣跨敤 STARTTLS瀹夊叏杩炴帴锛孲TARTTLS鏄绾枃鏈�氫俊鍗忚鐨勬墿灞曘�� + starttlsEnable: true + # 浣跨敤SSL瀹夊叏杩炴帴 + sslEnable: true + # SMTP瓒呮椂鏃堕暱锛屽崟浣嶆绉掞紝缂虹渷鍊间笉瓒呮椂 + timeout: 0 + # Socket杩炴帴瓒呮椂鍊硷紝鍗曚綅姣锛岀己鐪佸�间笉瓒呮椂 + connectionTimeout: 0 + +--- # sms 鐭俊 +sms: + enabled: false + # 闃块噷浜� dysmsapi.aliyuncs.com + # 鑵捐浜� sms.tencentcloudapi.com + endpoint: "dysmsapi.aliyuncs.com" + accessKeyId: xxxxxxx + accessKeySecret: xxxxxx + signName: 娴嬭瘯 + # 鑵捐涓撶敤 + sdkAppId: -- Gitblit v1.9.3