From c4175d55b04b4bdf3150e19772ad71eae8292e95 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sat, 17 Mar 2018 23:45:41 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/configuration/DruidConfig.java     | 2 +-
 .../main/java/com/xwbing/configuration/ServletFilterConfig.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java
index 95b7a4f..56eebb8 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
 import java.sql.SQLException;
 
 /**
- * 说明: 德鲁伊监控:druid/index.html
+ * 说明: 德鲁伊数据源。监控地址:druid/index.html
  * 项目名称: boot-module-demo
  * 创建时间: 2017/5/10 16:36
  * 作者:  xiangwb
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 72510dd..3278e40 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
@@ -41,6 +41,7 @@ public class ServletFilterConfig {
         registration.addInitParameter("resetEnable", "false");//禁用HTML页面上的“Reset All”功能
         return registration;
     }
+
     /*******************************************************/
 
     @Bean