From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-admin/src/main/resources/application-prod.yml | 59 +++++------------------------------------------------------
1 files changed, 5 insertions(+), 54 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 2640bc0..446d54d 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -4,7 +4,9 @@
type: com.alibaba.druid.pool.DruidDataSource
# 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
dynamic:
- #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
+ # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�)
+ p6spy: false
+ # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
primary: master
datasource:
# 涓诲簱鏁版嵁婧�
@@ -122,62 +124,11 @@
admin:
# Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
client:
+ # 澧炲姞瀹㈡埛绔紑鍏�
+ enabled: true
# 璁剧疆 Spring Boot Admin Server 鍦板潃
url: http://172.30.0.90: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: health,info
- 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