From 0077cb9a13242b7e48cd93b6a233fd1d60fd11c1 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Mon, 19 Mar 2018 16:48:02 +0800 Subject: [PATCH] merge --- boot-service/pom.xml | 2 +- .../java/com/xwbing/configuration/ServletFilterConfig.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot-service/pom.xml b/boot-service/pom.xml index 63b9ccc..f2bccd7 100644 --- a/boot-service/pom.xml +++ b/boot-service/pom.xml @@ -43,7 +43,7 @@ com.alibaba druid - 1.0.20 + 1.1.5 mysql diff --git a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java index f3d499e..ec1e445 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java @@ -35,7 +35,7 @@ public class ServletFilterConfig { registration.addUrlMappings("/druid/*"); //添加初始化参数:initParams // registration.addInitParameter("allow", "127.0.0.1");//IP白名单(没有配置或者为空,则允许所有访问) -// registration.addInitParameter("deny", "192.168.31.234");//IP黑名单(存在共同时,deny优先于allow) +// registration.addInitParameter("deny", "172.17.21.232");//IP黑名单(存在共同时,deny优先于allow) registration.addInitParameter("loginUsername", "admin");//用户名 registration.addInitParameter("loginPassword", "123456");//密码 registration.addInitParameter("resetEnable", "true");//禁用HTML页面上的"Reset All"功能 @@ -50,7 +50,7 @@ public class ServletFilterConfig { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter()); filterRegistrationBean.addUrlPatterns("/*"); filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,*.jsp,/druid/*"); - filterRegistrationBean.addInitParameter("profileEnable", "true");//监控单个url调用的sql列表 + filterRegistrationBean.addInitParameter("profileEnable", "true"); return filterRegistrationBean; } }