From ffd3dc335f7e29aff310c9ad7a3f72272a4bc457 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 05 八月 2021 13:30:04 +0800
Subject: [PATCH] update 将 Actuator 配置 移动到全局配置

---
 ruoyi-admin/src/main/resources/application-prod.yml |   14 --------------
 pom.xml                                             |    3 +++
 ruoyi-admin/src/main/resources/application.yml      |   14 ++++++++++++++
 ruoyi-admin/src/main/resources/application-dev.yml  |   14 --------------
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee443ec..0bdc04f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,7 @@
                 <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
                 <profiles.active>local</profiles.active>
                 <logging.level>debug</logging.level>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
         </profile>
         <profile>
@@ -298,6 +299,7 @@
                 <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
                 <profiles.active>dev</profiles.active>
                 <logging.level>debug</logging.level>
+                <endpoints.include>'*'</endpoints.include>
             </properties>
             <activation>
                 <!-- 榛樿鐜 -->
@@ -309,6 +311,7 @@
             <properties>
                 <profiles.active>prod</profiles.active>
                 <logging.level>warn</logging.level>
+                <endpoints.include>health,info</endpoints.include>
             </properties>
         </profile>
 
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 6491c85..8cd5d8b 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -129,20 +129,6 @@
         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閰嶇疆
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 2640bc0..9f29001 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -129,20 +129,6 @@
         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閰嶇疆
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9b75fb6..9377ff0 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -287,6 +287,20 @@
   # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
   expire: 30000
 
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+  endpoints:
+    web:
+      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
+      base-path: /actuator
+      exposure:
+        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log
+
 --- # 瀹氭椂浠诲姟閰嶇疆
 spring:
   quartz:

--
Gitblit v1.9.3