From 17f4306675e7d64e259210fe7b66f050aa689af8 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 27 May 2018 20:32:01 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/demo/sql/sql.sql |  3 +++
 .../src/main/resources/druid.properties       |  4 ++--
 .../configuration/ServletFilterConfig.java    | 20 +++++++++----------
 ...ot_module_demo.sql => boot_module_pro.sql} |  0
 4 files changed, 14 insertions(+), 13 deletions(-)
 rename boot-web/src/main/resources/{boot_module_demo.sql => boot_module_pro.sql} (100%)

diff --git a/boot-service/src/main/java/com/xwbing/demo/sql/sql.sql b/boot-service/src/main/java/com/xwbing/demo/sql/sql.sql
index 3880eed..62bf184 100644
--- a/boot-service/src/main/java/com/xwbing/demo/sql/sql.sql
+++ b/boot-service/src/main/java/com/xwbing/demo/sql/sql.sql
@@ -19,7 +19,10 @@ mysql -u用户名 -p密码
 mysql -hIP地址 -u用户名 -p密码
 修改密码
 mysqladmin -u用户名 -p旧密码 password 新密码
+导出数据库文件
+mysqldump -u用户名 -p密码 数据库名 > F:/file.sql
 
+status;
 show databases;
 create database <数据库名>;
 drop database <数据库名>;
diff --git a/boot-service/src/main/resources/druid.properties b/boot-service/src/main/resources/druid.properties
index 2ab17e2..bab36ca 100644
--- a/boot-service/src/main/resources/druid.properties
+++ b/boot-service/src/main/resources/druid.properties
@@ -1,8 +1,8 @@
 # 数据库基本信息配置
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/xwbing?useUnicode=true&characterEncoding=utf8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/xwbing?useUnicode=true&characterEncoding=utf8&useSSL=false
 jdbc.username=root
-jdbc.password=
+jdbc.password=xwbing
 # 初始化大小，最小，最大
 jdbc.initSize=1
 jdbc.minIdle=3
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 7187392..8aa88ce 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ServletFilterConfig.java
@@ -1,9 +1,7 @@
 package com.xwbing.configuration;
 
-import com.xwbing.handler.FormRepeatFilter;
 import com.xwbing.util.captcha.CaptchaServlet;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -27,13 +25,13 @@ public class ServletFilterConfig {
 
     /*servlet*****************************************************filter*/
 
-    @Bean
-    public FilterRegistrationBean formSaveFilter() {
-        log.info("注册表单重复提交过滤器formSaveFilter ======================= ");
-        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new FormRepeatFilter());
-        filterRegistrationBean.addUrlPatterns("/*");
-        filterRegistrationBean.addInitParameter("excludePath", "/doc,/captcha,/v2/api-docs,/swagger-resources,/configuration/ui,/configuration/security,/druid");
-        filterRegistrationBean.addInitParameter("excludeType", ".js,.css,.gif,.jpg,.png,.ico,.jsp,.html,/druid/");
-        return filterRegistrationBean;
-    }
+//    @Bean
+//    public FilterRegistrationBean formSaveFilter() {
+//        log.info("注册表单重复提交过滤器formSaveFilter ======================= ");
+//        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new FormRepeatFilter());
+//        filterRegistrationBean.addUrlPatterns("/*");
+//        filterRegistrationBean.addInitParameter("excludePath", "/doc,/captcha,/v2/api-docs,/swagger-resources,/configuration/ui,/configuration/security,/druid");
+//        filterRegistrationBean.addInitParameter("excludeType", ".js,.css,.gif,.jpg,.png,.ico,.jsp,.html,/druid/");
+//        return filterRegistrationBean;
+//    }
 }
diff --git a/boot-web/src/main/resources/boot_module_demo.sql b/boot-web/src/main/resources/boot_module_pro.sql
similarity index 100%
rename from boot-web/src/main/resources/boot_module_demo.sql
rename to boot-web/src/main/resources/boot_module_pro.sql