From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-admin/src/main/resources/application-prod.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 7d9801f..2640bc0 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -42,6 +42,10 @@
testOnReturn: false
# 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
filters: stat
+
+--- # druid 閰嶇疆
+spring:
+ datasource:
druid:
webStatFilter:
enabled: true
@@ -63,7 +67,9 @@
wall:
config:
multi-statement-allow: true
- # redis 閰嶇疆
+
+--- # redis 閰嶇疆
+spring:
redis:
# 鍦板潃
host: 172.30.0.48
@@ -78,7 +84,6 @@
# 鏄惁寮�鍚痵sl
ssl: false
---- # redisson 瀹㈡埛绔厤缃�
redisson:
# 绾跨▼姹犳暟閲�
threads: 16
@@ -137,3 +142,42 @@
endpoint:
logfile:
external-file: ./logs/sys-console.log
+
+--- # OSS 浜戝瓨鍌�(鐣岄潰 <鍙傛暟璁剧疆> 鍙垏鎹�)
+cloud-storage:
+ # minio閰嶇疆
+ minio:
+ endpoint: http://172.30.0.54: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