root
/
boot-security
mirror of https://gitee.com/zhang_1334717033/boot-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!10 作废DruidConfig类 

Merge pull request !10 from zwzw1219/aa
master
zwzw1219 2018-05-24 22:31:23 +08:00
parent 3cf48071da
commit a8f0d39795
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -2,3 +2,4 @@
## 2018.03.05 spring boot 由1.5.10 升级到2.0.0 ## 2018.03.05 spring boot 由1.5.10 升级到2.0.0
## 2018.03.15上传文件的大小配置修改spring.http.multipart改为spring.servlet.multipart ## 2018.03.15上传文件的大小配置修改spring.http.multipart改为spring.servlet.multipart
## 2018.04.14 layui升级到2.2.6 ## 2018.04.14 layui升级到2.2.6
## 2018.05.24作废DruidConfig类，将druid改为配置的方式，前缀为spring.datasource.druid

14
pom.xml
View File

@ -16,7 +16,7 @@
<swagger.version>2.8.0</swagger.version> <swagger.version>2.8.0</swagger.version>
<google.guava>23.0</google.guava> <google.guava>23.0</google.guava>
<fastjson.version>1.2.47</fastjson.version> <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> <poi.version>3.17</poi.version>
<jwt.version>0.9.0</jwt.version> <jwt.version>0.9.0</jwt.version>
<mybatis.version>1.3.2</mybatis.version> <mybatis.version>1.3.2</mybatis.version>
@ -82,16 +82,16 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>-->
<!-- druid需要此日志包 --> <!--改为stater的方式-->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>com.alibaba</groupId>
<artifactId>log4j</artifactId> <artifactId>druid-spring-boot-starter</artifactId>
<version>1.2.17</version> <version>${druid.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>

17
src/main/java/com/boot/security/server/config/DruidConfig.java
View File

@ -1,29 +1,28 @@
package com.boot.security.server.config; package com.boot.security.server.config;
import java.sql.SQLException; import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet;
import javax.sql.DataSource; import com.alibaba.druid.support.http.WebStatFilter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import com.alibaba.druid.pool.DruidDataSource; import javax.sql.DataSource;
import com.alibaba.druid.support.http.StatViewServlet; import java.sql.SQLException;
import com.alibaba.druid.support.http.WebStatFilter;
/** /**
* Druid数据源配置 * Druid数据源配置
* 2018.05.24改为配置的方式,配置前缀spring.datasource.druid，看下application.yml
* *
* @author 小威老师 * @author 小威老师
* *
*/ */
@Configuration @Deprecated
//@Configuration
public class DruidConfig { public class DruidConfig {
private static final Logger log = LoggerFactory.getLogger("adminLogger"); private static final Logger log = LoggerFactory.getLogger("adminLogger");

1
src/main/resources/application.yml
View File

@ -4,6 +4,7 @@ spring:
url: jdbc:mysql://localhost:3306/boot_security?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false url: jdbc:mysql://localhost:3306/boot_security?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
username: root username: root
password: root password: root
druid:
initialSize: 5 initialSize: 5
minIdle: 5 minIdle: 5
maxActive: 20 maxActive: 20