diff --git a/druid-spring-boot-samples/src/main/resources/application-dev.properties b/druid-spring-boot-samples/src/main/resources/application-dev.properties new file mode 100644 index 0000000..3842461 --- /dev/null +++ b/druid-spring-boot-samples/src/main/resources/application-dev.properties @@ -0,0 +1,2 @@ +spring.datasource.druid.min-evictable-idle-time-millis=100000 +spring.datasource.druid.max-evictable-idle-time-millis=200000 \ No newline at end of file diff --git a/druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties b/druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties new file mode 100644 index 0000000..f978bd4 --- /dev/null +++ b/druid-spring-boot-samples/src/main/resources/application-dynamic-dev.properties @@ -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 \ No newline at end of file diff --git a/druid-spring-boot-samples/src/main/resources/application.yml b/druid-spring-boot-samples/src/main/resources/application.yml index 2578768..6102f65 100644 --- a/druid-spring-boot-samples/src/main/resources/application.yml +++ b/druid-spring-boot-samples/src/main/resources/application.yml @@ -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 \ No newline at end of file + name: two + min-evictable-idle-time-millis: 100001 + max-evictable-idle-time-millis: 200002 \ No newline at end of file diff --git a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java index 163c65c..028e9f8 100644 --- a/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java +++ b/druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DynamicDevProfilesTests.java @@ -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()); } } \ No newline at end of file