From d2de7c71015b0b1b6eeb51b602f5ac9a7802b71f Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Tue, 26 Dec 2017 17:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=9A=E4=B8=8Adruid=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/browser/config/BrowserSecurityConfig.java   | 4 ++++
 .../micro/fast/common/config/DataSourceMasterConfig.java | 9 +++++----
 .../micro/fast/common/config/DataSourceSlaveConfig.java  | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
index 60bd82b..6fd4f0c 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
@@ -40,6 +40,9 @@ import javax.sql.DataSource;
  */
 @Configuration
 public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter {
+
+  //todo 待优化,不唯一,应从启动参数中获取
+  public static final String DRUID = "/druid/*";
   /**
    * 注入身份认证框架配置参数对象
    */
@@ -117,6 +120,7 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter {
             , SecurityConstants.FORM_LOGIN_PROCESSOR_URI
             , SecurityConstants.GET_VALIDATE_CODE_URI
             , SecurityConstants.LOGIN_PAGE
+            , DRUID
             , securityProperties.getBrowser().getHtml())
         .permitAll()
         //任何请求
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
index 1dd0882..e8b44b1 100644
--- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
@@ -51,7 +51,7 @@ public class DataSourceMasterConfig {
   private DruidMasterParamConfig druidMasterParamConfig;
 
   /**
-   * 注册druid的servlet
+   * 注册druid的监控视图servlet
    * @return servletRegistrationBean
    */
   @Bean(name = "masterDruidServlet")
@@ -109,7 +109,7 @@ public class DataSourceMasterConfig {
   }
 
   /**
-   * 注册druid过滤器
+   * 注册druid过滤器用于对url的执行sql进行监控
    * @return filterRegistrationBean
    */
   @Bean
@@ -128,7 +128,7 @@ public class DataSourceMasterConfig {
   }
 
   /**
-   * 根据BeanId来设置拦截配置，用来bean的监控
+   * spring-druid监控配置
    * @return druidStatInterceptor
    */
   @Bean(value = "druid-stat-interceptor")
@@ -138,7 +138,7 @@ public class DataSourceMasterConfig {
   }
 
   /**
-   * 设置要拦截统计的bean
+   * 设置要拦截统计的bean,根据BeanId来设置拦截配置，用来bean的监控
    * @return beanNameAutoProxyCreator
    */
   @Bean
@@ -250,6 +250,7 @@ public class DataSourceMasterConfig {
     }
 
     try {
+      //开启sql监控
       druidDataSource.setFilters("stat,wall");
     } catch (SQLException e) {
       if (logger.isErrorEnabled()) {
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
index 88f91d0..b492229 100644
--- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java
@@ -136,6 +136,7 @@ public class DataSourceSlaveConfig {
     }
 
     try {
+      //开启sql监控
       druidDataSource.setFilters("stat,wall");
     } catch (SQLException e) {
       if (logger.isErrorEnabled()) {