From ffd3dc335f7e29aff310c9ad7a3f72272a4bc457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 5 Aug 2021 13:30:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=86=20Actuator=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E7=A7=BB=E5=8A=A8=E5=88=B0=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index ee443eca..0bdc04f0 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 6491c855..8cd5d8b9 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -129,20 +129,6 @@ spring:
         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 2640bc0e..9f290014 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -129,20 +129,6 @@ spring:
         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 9b75fb61..9377ff00 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -287,6 +287,20 @@ lock4j:
   # 分布式锁的超时时间，默认为 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: