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 =========#