Merge pull request #1855 from lihengming/master

Druid Spring Boot Starter > V1.1.2 优化 & 增强

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)

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)
+    @ConditionalOnProperty(prefix = FILTER_STAT_PREFIX, name = "enabled", matchIfMissing = true)
     @ConditionalOnMissingBean
-    @ConditionalOnProperty(prefix = FILTER_CONFIG_PREFIX, name = "enabled", matchIfMissing = true)
     public StatFilter statFilter() {
         return new StatFilter();
     }
@@ -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();
     }