From 08db4a5f53e17f3224e4f0caa66f1b76e3971aaf Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 04 八月 2021 19:03:25 +0800 Subject: [PATCH] update 更改所有业务excel导出 --- ruoyi-admin/src/main/resources/application-dev.yml | 124 +++++++++++++++++++++++++++++++++-------- 1 files changed, 99 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 75093f7..6491c85 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,10 +1,11 @@ # 鏁版嵁婧愰厤缃� spring: - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: type: com.alibaba.druid.pool.DruidDataSource + # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content dynamic: + #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master + primary: master datasource: # 涓诲簱鏁版嵁婧� master: @@ -14,32 +15,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: @@ -60,7 +67,9 @@ wall: config: multi-statement-allow: true - # redis 閰嶇疆 + +--- # redis 閰嶇疆 +spring: redis: # 鍦板潃 host: localhost @@ -75,7 +84,6 @@ # 鏄惁寮�鍚痵sl ssl: false ---- # redisson 瀹㈡埛绔厤缃� redisson: # 绾跨▼姹犳暟閲� threads: 16 @@ -107,3 +115,69 @@ subscriptionsPerConnection: 5 # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣 dnsMonitoringInterval: 5000 + +--- # 鐩戞帶閰嶇疆 +spring: + boot: + admin: + # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆 + client: + # 璁剧疆 Spring Boot Admin Server 鍦板潃 + url: http://localhost: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: '*' + endpoint: + logfile: + external-file: ./logs/sys-console.log + +--- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�) +cloud-storage: + # minio閰嶇疆 + minio: + endpoint: http://localhost:9000 + accessKey: ruoyi + secretKey: ruoyi123 + bucketName: ruoyi + # 涓冪墰浜戦厤缃� + qiniu: + domain: http://XXX.XXXX.com + prefix: + accessKey: XXXXXXXXXXXXXXX + secretKey: XXXXXXXXXXXXXXX + bucketName: ruoyi + isHttps: false + # z0 鍗庝笢 z1 鍗庡寳 z2 鍗庡崡 na0 鍖楃編 as0 涓滃崡浜� + # 涓嶅~涓鸿嚜鍔ㄨ幏鍙�(鎬ц兘浣� 鏄撳嚭闂) + region: z0 + # 闃块噷浜戦厤缃� + aliyun: + endpoint: http://oss-cn-beijing.aliyuncs.com + prefix: + accessKeyId: XXXXXXXXXXXXXXX + accessKeySecret: XXXXXXXXXXXXXXX + bucketName: ruoyi + # 鑵捐浜戦厤缃� + qcloud: + endpoint: http://cos.ap-beijing.myqcloud.com + prefix: + secretId: XXXXXXXXXXXXXXX + secretKey: XXXXXXXXXXXXXXX + # 鑵捐浜慴ucket鍚嶈鍒� 鏍煎紡涓� BucketName-APPID 姝ゅ濉啓鐨勫瓨鍌ㄦ《鍚嶇О蹇呴』涓烘鏍煎紡 + bucketName: ruoyi-1250000000 + isHttps: false + # 鍦板煙鍚嶅弬鑰冨畼鏂规枃妗� + # https://cloud.tencent.com/document/product/436/6224 + region: ap-beijing -- Gitblit v1.9.3