Skip to content

Commit f3eb8f9

Browse files
committed
增加 druid-spring-boot-starter,升级各依赖版本
1 parent 9fe1699 commit f3eb8f9

File tree

5 files changed

+19
-152
lines changed

5 files changed

+19
-152
lines changed

pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.5.1.RELEASE</version>
14+
<version>1.5.3.RELEASE</version>
1515
</parent>
1616

1717
<properties>
@@ -90,14 +90,21 @@
9090
<dependency>
9191
<groupId>com.github.pagehelper</groupId>
9292
<artifactId>pagehelper-spring-boot-starter</artifactId>
93-
<version>1.1.1</version>
93+
<version>1.1.2</version>
9494
</dependency>
9595

9696
<dependency>
9797
<groupId>org.springframework.boot</groupId>
9898
<artifactId>spring-boot-configuration-processor</artifactId>
9999
<optional>true</optional>
100100
</dependency>
101+
102+
<dependency>
103+
<groupId>com.alibaba</groupId>
104+
<artifactId>druid-spring-boot-starter</artifactId>
105+
<version>1.1.0</version>
106+
</dependency>
107+
101108
</dependencies>
102109

103110
<build>

src/main/java/tk/mybatis/springboot/druid/DruidAutoConfiguration.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/main/java/tk/mybatis/springboot/druid/DruidProperties.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/main/resources/application.properties

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
server.port=9090
22
logging.level.tk.mybatis=TRACE
3-
druid.url=jdbc:mysql://192.168.16.137:3306/test
4-
druid.driver-class=com.mysql.jdbc.Driver
5-
druid.username=root
6-
druid.password:
7-
druid.initial-size=1
8-
druid.min-idle=1
9-
druid.max-active=20
10-
druid.test-on-borrow=true
3+
spring.datasource.url=jdbc:mysql://localhost:3306/test
4+
spring.datasource.username=root
5+
spring.datasource.password=
6+
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
7+
spring.datasource.druid.initial-size=1
8+
spring.datasource.druid.min-idle=1
9+
spring.datasource.druid.max-active=20
10+
spring.datasource.druid.test-on-borrow=true
11+
spring.datasource.druid.stat-view-servlet.allow=true
12+
1113
spring.mvc.view.prefix=/templates/
1214
spring.mvc.view.suffix=.ftl
1315
spring.freemarker.cache=false

0 commit comments

Comments
 (0)