1.0.2

TODO.md

@@ -1,4 +1,5 @@
 # TODO
 
-## 1.0.2 自动提示增强
-1. 增加 `WallConfig` 的提示
+## 1.0.2
+~~1. 增加 `WallConfig` 的提示~~
+2. 增加 `ConfigFilter` 的配置，替换默认的 ConnectProperties 方式

druid-spring-boot-autoconfigure/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-autoconfigure</artifactId>

druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java

@@ -8,6 +8,7 @@ import com.alibaba.druid.filter.logging.Log4jFilter;
 import com.alibaba.druid.filter.logging.Slf4jLogFilter;
 import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.wall.WallConfig;
 import com.alibaba.druid.wall.WallFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,17 +57,25 @@ public class DruidAutoConfiguration {
         return new StatFilter();
     }
 
+    @ConditionalOnProperty(prefix = DRUID_WALL_FILTER_PREFIX, name = "enabled", havingValue = "true")
+    @Bean
+    @ConfigurationProperties(DRUID_WALL_CONFIG_PREFIX)
+    public WallConfig wallConfig() {
+        return new WallConfig();
+    }
+
     @ConditionalOnProperty(prefix = DRUID_WALL_FILTER_PREFIX, name = "enabled", havingValue = "true")
     @Bean
     @ConfigurationProperties(DRUID_WALL_FILTER_PREFIX)
-    public WallFilter wallFilter() {
+    public WallFilter wallFilter(WallConfig wallConfig) {
         log.debug("druid wall-filter init...");
-        return new WallFilter();
+        WallFilter filter = new WallFilter();
+        filter.setConfig(wallConfig);
+        return filter;
     }
 
     @ConditionalOnProperty(prefix = DRUID_CONFIG_FILTER_PREFIX, name = "enabled", havingValue = "true")
     @Bean
-    @ConfigurationProperties(DRUID_CONFIG_FILTER_PREFIX)
     public ConfigFilter configFilter() {
         log.debug("druid config-filter init...");
         return new ConfigFilter();

druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidProperties.java

@@ -16,6 +16,7 @@ public class DruidProperties {
     public static final String DRUID_DATA_SOURCE_PREFIX = "spring.datasource.druid";
     public static final String DRUID_STAT_FILTER_PREFIX = "spring.datasource.druid.stat";
     public static final String DRUID_WALL_FILTER_PREFIX = "spring.datasource.druid.wall";
+    public static final String DRUID_WALL_CONFIG_PREFIX = "spring.datasource.druid.wall.config";
     public static final String DRUID_CONFIG_FILTER_PREFIX = "spring.datasource.druid.config";
     public static final String DRUID_SLF4J_FILTER_PREFIX = "spring.datasource.druid.slf4j";
     public static final String DRUID_LOG4J_FILTER_PREFIX = "spring.datasource.druid.log4j";

druid-spring-boot-samples/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-samples</artifactId>

druid-spring-boot-samples/src/main/resources/application.yml

@@ -47,6 +47,8 @@ spring:
         db-type: h2
         log-violation: true
         throw-exception: false
+        config:
+          select-all-column-allow: false
       aop-stat:
         enabled: false
         patterns:

druid-spring-boot-samples/src/test/java/com/github/trang/druid/test/DruidTests.java

@@ -1,6 +1,8 @@
 package com.github.trang.druid.test;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.wall.WallFilter;
+import com.github.trang.druid.mapper.CityMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,10 @@ public class DruidTests {
 
     @Autowired
     private DruidDataSource dataSource;
+    @Autowired
+    private WallFilter wallFilter;
+    @Autowired
+    private CityMapper cityMapper;
 
     @Test
     public void testDataSource() {
@@ -36,4 +42,9 @@ public class DruidTests {
         assertEquals(dataSource.isUseGlobalDataSourceStat(), true);
     }
 
+    @Test
+    public void testMybatis() {
+        System.out.println(cityMapper.findById(1L));
+    }
+
 }

druid-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-starter</artifactId>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.github.drtrang</groupId>
     <artifactId>druid-spring-boot</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>