From 86fba4aed4bbff5a96fd3c28d327a55d6b34a6c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 13 八月 2021 14:10:16 +0800
Subject: [PATCH] remove 删除配置文件 OSS存储相关配置

---
 ruoyi-admin/src/main/resources/application-dev.yml |   68 ++++++----------------------------
 1 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5effcea..7804994 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -4,7 +4,9 @@
     type: com.alibaba.druid.pool.DruidDataSource
     # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
     dynamic:
-      #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
+      # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�)
+      p6spy: true
+      # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
       primary: master
       datasource:
         # 涓诲簱鏁版嵁婧�
@@ -42,6 +44,10 @@
         testOnReturn: false
         # 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
         filters: stat
+
+--- # druid 閰嶇疆
+spring:
+  datasource:
     druid:
       webStatFilter:
         enabled: true
@@ -63,7 +69,9 @@
         wall:
           config:
             multi-statement-allow: true
-  # redis 閰嶇疆
+
+--- # redis 閰嶇疆
+spring:
   redis:
     # 鍦板潃
     host: localhost
@@ -78,7 +86,6 @@
     # 鏄惁寮�鍚痵sl
     ssl: false
 
---- # redisson 瀹㈡埛绔厤缃�
 redisson:
   # 绾跨▼姹犳暟閲�
   threads: 16
@@ -117,62 +124,11 @@
     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
-
-# 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