From 5b9a7c1d2ce6a36b7648c6303ce2b6394eeee35b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 23 Sep 2024 13:32:53 +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 | 4 ++-- modules/core/src/main/resources/config/jeesite-core.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) 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 2f06b8c0..7ac40630 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 { /** @@ -43,7 +43,7 @@ public class DruidStatConfig { bean.addUrlPatterns("/*"); return bean; } - + /** * 注册DruidServlet */ diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index cca6a748..35a996bf 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -343,6 +343,12 @@ gen: # 系统监控 state: enabled: true + # 服务器监控 + server: true + # 缓存监控 + cache: true + # 数据监控 + druid: true #======================================# #========= Framework settings =========#