From a8f0d3979586072a811f19b22da0f20233b993cb Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@163.com>
Date: Thu, 24 May 2018 22:31:23 +0800
Subject: [PATCH] =?UTF-8?q?!10=20=E4=BD=9C=E5=BA=9FDruidConfig=E7=B1=BB=20?=
 =?UTF-8?q?Merge=20pull=20request=20!10=20from=20zwzw1219/aa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 pom.xml                                       | 16 +++++-----
 .../security/server/config/DruidConfig.java   | 19 ++++++------
 src/main/resources/application.yml            | 29 ++++++++++---------
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 0ab222a..349a9db 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@
 ## 2018.03.05 spring boot 由1.5.10 升级到2.0.0
 ## 2018.03.15上传文件的大小配置修改spring.http.multipart改为spring.servlet.multipart
 ## 2018.04.14 layui升级到2.2.6
+## 2018.05.24作废DruidConfig类，将druid改为配置的方式，前缀为spring.datasource.druid
diff --git a/pom.xml b/pom.xml
index cf84cb0..3981f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 		<swagger.version>2.8.0</swagger.version>
 		<google.guava>23.0</google.guava>
 		<fastjson.version>1.2.47</fastjson.version>
-		<druid.version>1.1.8</druid.version>
+		<druid.version>1.1.9</druid.version>
 		<poi.version>3.17</poi.version>
 		<jwt.version>0.9.0</jwt.version>
 		<mybatis.version>1.3.2</mybatis.version>
@@ -82,17 +82,17 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
 			<version>${druid.version}</version>
-		</dependency>
-		<!-- druid需要此日志包 -->
+		</dependency>-->
+		<!--改为stater的方式-->
 		<dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>${druid.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
diff --git a/src/main/java/com/boot/security/server/config/DruidConfig.java b/src/main/java/com/boot/security/server/config/DruidConfig.java
index ba084ee..1d61391 100644
--- a/src/main/java/com/boot/security/server/config/DruidConfig.java
+++ b/src/main/java/com/boot/security/server/config/DruidConfig.java
@@ -1,29 +1,28 @@
 package com.boot.security.server.config;
 
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 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;
 import org.springframework.context.annotation.Primary;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
+import javax.sql.DataSource;
+import java.sql.SQLException;
 
 /**
  * Druid数据源配置
- * 
+ * 2018.05.24改为配置的方式,配置前缀spring.datasource.druid，看下application.yml
+ *
  * @author 小威老师
  *
  */
-@Configuration
+@Deprecated
+//@Configuration
 public class DruidConfig {
 
 	private static final Logger log = LoggerFactory.getLogger("adminLogger");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 431caeb..cf0d0f9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,20 +4,21 @@ spring:
     url: jdbc:mysql://localhost:3306/boot_security?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
     username: root
     password: root
-    initialSize: 5
-    minIdle: 5
-    maxActive: 20
-    maxWait: 60000
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: SELECT 1
-    testWhileIdle: true
-    testOnBorrow: true
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    filters: stat,wall
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 20
+      maxWait: 60000
+      timeBetweenEvictionRunsMillis: 60000
+      minEvictableIdleTimeMillis: 300000
+      validationQuery: SELECT 1
+      testWhileIdle: true
+      testOnBorrow: true
+      testOnReturn: false
+      poolPreparedStatements: true
+      maxPoolPreparedStatementPerConnectionSize: 20
+      filters: stat,wall
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     joda-date-time-format: yyyy-MM-dd HH:mm:ss
-- 
Gitee