Alawn/druid-spring-boot
1
0
Fork 0
mirror of https://github.com/drtrang/druid-spring-boot.git synced 2026-10-29 12:37:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4 from lihengming/master

Browse Source 
update > dynamic-dev test case
This commit is contained in:
Trang
2017-07-20 19:55:56 +08:00
committed by GitHub
parent dfb97a4cb6 38421d1922
commit 7be226419b
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-samples/src/main/resources/application-dev.properties
+2
View File
@@ -0,0 +1,2 @@
spring.datasource.druid.min-evictable-idle-time-millis=100000
spring.datasource.druid.max-evictable-idle-time-millis=200000
druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties
+5
View File
@@ -0,0 +1,5 @@
spring.autoconfigure.exclude=- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
spring.datasource.druid.one.min-evictable-idle-time-millis=100000
spring.datasource.druid.one.max-evictable-idle-time-millis=200000
spring.datasource.druid.two.min-evictable-idle-time-millis=100001
spring.datasource.druid.two.max-evictable-idle-time-millis=200002
druid-spring-boot-samples/src/main/resources/application.yml
+5 -3
View File
@@ -128,9 +128,11 @@ spring:
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
datasource:
druid:
min-evictable-idle-time-millis: 100000
max-evictable-idle-time-millis: 200000
one:
name: one
min-evictable-idle-time-millis: 100000
max-evictable-idle-time-millis: 200000
two:
name: two
name: two
min-evictable-idle-time-millis: 100001
max-evictable-idle-time-millis: 200002
druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class DynamicDevProfilesTests extends BaseTest {
@Test
public void testSecondDataSource() {
assertEquals(100000, secondDataSource.getMinEvictableIdleTimeMillis());
assertEquals(200000, secondDataSource.getMaxEvictableIdleTimeMillis());
assertEquals(100001, secondDataSource.getMinEvictableIdleTimeMillis());
assertEquals(200002, secondDataSource.getMaxEvictableIdleTimeMillis());
}
}