From 509ab88fee524e5bc93097adef33988b8851b8e7 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 23 Sep 2024 13:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E6=8E=A7=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E5=8F=82=E6=95=B0=20=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=20state.server=20=E7=BC=93=E5=AD=98=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=20state.cache=20=E6=95=B0=E6=8D=AE=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=20state.druid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/config/web/DruidStatConfig.java     | 2 +-
 modules/core/src/main/resources/config/jeesite-core.yml     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
index 6dc5dfc2..3fef6bfe 100644
--- a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
+++ b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
@@ -25,7 +25,7 @@ import java.io.IOException;
  * @version 2017年11月30日
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name="state.enabled", havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name={"state.enabled","state.druid"}, havingValue="true", matchIfMissing=true)
 public class DruidStatConfig {
 
 	/**
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index bcd35a0a..228d5abe 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -340,6 +340,12 @@ gen:
 # 系统监控
 state:
   enabled: true
+  # 服务器监控
+  server: true
+  # 缓存监控
+  cache: true
+  # 数据监控
+  druid: true
 
 #======================================#
 #========= Framework settings =========#