From 67610c7ef221e13111d8508f9360e4f3c1293ff9 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Mon, 24 Jul 2017 01:17:32 +0800 Subject: [PATCH 1/3] update > for V1.1.2 --- druid-spring-boot-starter/README.md | 2 +- .../boot/autoconfigure/stat/DruidFilterConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/druid-spring-boot-starter/README.md b/druid-spring-boot-starter/README.md index 85a5c5b95f..9ee2892f41 100644 --- a/druid-spring-boot-starter/README.md +++ b/druid-spring-boot-starter/README.md @@ -153,7 +153,7 @@ spring.datasource.druid.filter.wall.config.drop-table-allow=false - Log4j2Filter - CommonsLogFilter -要想使自定义 Filter 配置生效需要将对应 Filter 的 ```enabled``` 设置为 ```true``` ，Druid Spring Boot Starter 默认会启用 StatFilter，你也可以将其 ```enabled``` 设置为 ```false``` 来禁用它 +要想使自定义 Filter 配置生效需要将对应 Filter 的 ```enabled``` 设置为 ```true``` ，Druid Spring Boot Starter 默认会启用 StatFilter，你也可以将其 ```enabled``` 设置为 ```false``` 来禁用它。 ## IDE 提示支持 ![](https://raw.githubusercontent.com/lihengming/java-codes/master/shared-resources/github-images/druid-spring-boot-starter-ide-hint.jpg) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java index 94a2f4d37c..84b63abfca 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java @@ -34,7 +34,7 @@ public class DruidFilterConfiguration { @Bean @ConfigurationProperties(FILTER_STAT_PREFIX) @ConditionalOnMissingBean - @ConditionalOnProperty(prefix = FILTER_CONFIG_PREFIX, name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled", matchIfMissing = true) public StatFilter statFilter() { return new StatFilter(); } From a0e18f95a1de0cd3181123e54c21bf07395d8dbd Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Mon, 24 Jul 2017 01:20:02 +0800 Subject: [PATCH 2/3] update > for V1.1.2 --- .../boot/autoconfigure/stat/DruidFilterConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java index 84b63abfca..74c39e2743 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java @@ -33,8 +33,8 @@ public class DruidFilterConfiguration { @Bean @ConfigurationProperties(FILTER_STAT_PREFIX) - @ConditionalOnMissingBean @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled", matchIfMissing = true) + @ConditionalOnMissingBean public StatFilter statFilter() { return new StatFilter(); } From b338eaf1e1f67fc2d30dcabd51eff42cf0daa988 Mon Sep 17 00:00:00 2001 From: lihengming <89921218@qq.com> Date: Mon, 24 Jul 2017 01:21:09 +0800 Subject: [PATCH 3/3] update > for V1.1.2 --- .../spring/boot/autoconfigure/stat/DruidFilterConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java index 74c39e2743..f4eb69eaaf 100644 --- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java +++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidFilterConfiguration.java @@ -82,6 +82,7 @@ public class DruidFilterConfiguration { @Bean @ConfigurationProperties(FILTER_COMMONS_LOG_PREFIX) @ConditionalOnProperty(prefix = FILTER_COMMONS_LOG_PREFIX, name = "enabled") + @ConditionalOnMissingBean public CommonsLogFilter commonsLogFilter() { return new CommonsLogFilter(); }