From a49446a22d2f540f977bb0060eecf002e2ee4f03 Mon Sep 17 00:00:00 2001 From: eryan Date: Fri, 8 Nov 2019 08:33:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3Spring=20Boot=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=8BAOP=E4=BA=8C=E6=AC=A1=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/autoconfigure/stat/DruidSpringAopConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java index ee1697b05e..ad04ab620b 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java @@ -42,6 +42,7 @@ public class DruidSpringAopConfiguration { } @Bean + @ConditionalOnProperty(name = "spring.aop.auto",havingValue = "false") public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() { DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator(); advisorAutoProxyCreator.setProxyTargetClass(true); From c7089f7ea74d7ed530fc31d9cbb3cd4430ddc47e Mon Sep 17 00:00:00 2001 From: auntyellow Date: Mon, 16 Dec 2019 10:30:12 +0800 Subject: [PATCH 2/3] An JDBC ... => A JDBC ... --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d4db226ae..975492683e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ jar druid - An JDBC datasource implementation. + A JDBC datasource implementation. https://github.com/alibaba/druid 2013 From 6ee952e4c29aa5aa42201dfedde5aade4e16b8e9 Mon Sep 17 00:00:00 2001 From: codeimport <516673669@qq.com> Date: Mon, 30 Dec 2019 18:03:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=90=8E=E6=89=8D=E7=94=A8=E5=88=A4=E6=96=AD?= =?UTF-8?q?maxEvictableIdleTimeMillis=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index ae2daeddf5..da925b5e8a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -795,7 +795,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements LOG.error("maxEvictableIdleTimeMillis should be greater than 30000"); } - if (maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) { + if (inited && maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) { throw new IllegalArgumentException("maxEvictableIdleTimeMillis must be grater than minEvictableIdleTimeMillis"); }