Alawn/druid-spring-boot
1
0
Fork 0
mirror of https://github.com/drtrang/druid-spring-boot.git synced 2026-11-01 06:30:02 +00:00
Code Issues Releases Wiki Activity

1.0.2

Browse Source
This commit is contained in:
trang
2017-07-18 15:37:37 +08:00
parent 9e0e4d02a2
commit 09ceaf6304
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-autoconfigure/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.2</version>
</parent>
<artifactId>druid-spring-boot-autoconfigure</artifactId>
druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DataSourceInitializerConfiguration.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class DataSourceInitializerConfiguration {
@Bean
@ConditionalOnMissingBean(DataSourceInitializer.class)
public com.github.trang.druid.datasource.init.DataSourceInitializer dataSourceInitializer
public com.github.trang.druid.datasource.init.DataSourceInitializer customDataSourceInitializer
(DataSourceProperties properties, ApplicationContext applicationContext) {
return new DataSourceInitializer(properties, applicationContext);
}
druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java
+3 -3
View File
@@ -10,7 +10,6 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.wall.WallConfig;
import com.alibaba.druid.wall.WallFilter;
import com.github.trang.druid.datasource.DruidParentDataSource;
import com.github.trang.druid.properties.DruidProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -18,6 +17,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -36,8 +36,8 @@ import static com.github.trang.druid.properties.DruidProperties.*;
@Configuration
@ConditionalOnClass(DruidDataSource.class)
@AutoConfigureBefore(DataSourceAutoConfiguration.class)
@EnableConfigurationProperties(DruidProperties.class)
@Import({DruidStatConfiguration.class, DruidServletConfiguration.class})
@EnableConfigurationProperties(DataSourceProperties.class)
@Import({DruidStatConfiguration.class, DruidServletConfiguration.class, DataSourceInitializerConfiguration.class})
public class DruidAutoConfiguration {
private static final Logger log = LoggerFactory.getLogger(DruidAutoConfiguration.class);
druid-spring-boot-samples/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.2</version>
</parent>
<artifactId>druid-spring-boot-samples</artifactId>
druid-spring-boot-starter/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.2</version>
</parent>
<artifactId>druid-spring-boot-starter</artifactId>
pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.2</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>