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.1.10

Browse Source 
change beanName
import
pom
This commit is contained in:
donghaoliang
2018-05-28 18:56:52 +08:00
parent 3ad09f4f7c
commit 82cd9d91d1
17 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3
View File
@@ -6,6 +6,9 @@ install: false
cache:
directories:
- $HOME/.m2/repository
addons:
apt:
update: true
after_success:
- cd druid-spring-boot-example/druid-spring-boot-mybatis-example
- mvn clean test -Pcoveralls jacoco:report coveralls:report
Changelog.md
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## 1.1.10
### Enhancements
1. 升级 parent 版本到 1.2.2
2. 升级 druid 到 1.1.10
## 1.1.9
### Enhancements
1. 升级 druid 到 1.1.9
README.md
+4 -4
View File
@@ -15,24 +15,24 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.9.1</version>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator-starter</artifactId>
<version>1.1.9.1</version>
<version>1.1.10</version>
</dependency>
<!-- spring boot 2.x -->
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>1.1.9</version>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-actuator-starter</artifactId>
<version>1.1.9</version>
<version>1.1.10</version>
</dependency>
```
druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-actuator-autoconfigure</artifactId>
druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
+1 -1
View File
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration
com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration
druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-actuator-starter</artifactId>
druid-spring-boot-actuator/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-actuator</artifactId>
druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-example</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-jpa-example</artifactId>
druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-example</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-mybatis-example</artifactId>
druid-spring-boot-example/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-example</artifactId>
druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-autoconfigure</artifactId>
druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java
+2
View File
@@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import com.github.trang.druid.autoconfigure.datasource.init.DruidDataSourceInitializer;
@@ -30,6 +31,7 @@ import com.github.trang.druid.autoconfigure.datasource.init.DruidDataSourceIniti
public class DruidDataSourceInitializerAutoConfiguration {
@Bean
@Primary
@ConditionalOnMissingBean(value = DruidDataSourceInitializer.class, name = "dataSourceInitializer")
public DruidDataSourceInitializer dataSourceInitializer(DataSourceProperties properties,
ApplicationContext applicationContext) {
druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class DruidServletConfiguration {
* 2. 提供监控信息的 JSON API
*/
@Bean
public ServletRegistrationBean servletRegistrationBean(DruidDataSourceProperties druidProperties) {
public ServletRegistrationBean druidStatViewServlet(DruidDataSourceProperties druidProperties) {
log.debug("druid stat-view-servlet init...");
DruidStatViewServletProperties properties = druidProperties.getStatViewServlet();
ServletRegistrationBean registration = new ServletRegistrationBean(new StatViewServlet());
druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class DruidStatConfiguration {
}
@Bean
public DefaultAdvisorAutoProxyCreator druidStatProxyCreator() {
public DefaultAdvisorAutoProxyCreator druidStatProxy() {
log.debug("druid aop-stat init...");
DefaultAdvisorAutoProxyCreator druidStatProxyCreator = new DefaultAdvisorAutoProxyCreator();
druidStatProxyCreator.setProxyTargetClass(proxyTargetClass);
@@ -77,7 +77,7 @@ public class DruidStatConfiguration {
public static class DruidWebStatConfiguration {
@Bean
public FilterRegistrationBean filterRegistrationBean(DruidDataSourceProperties druidProperties) {
public FilterRegistrationBean druidWebStatFilter(DruidDataSourceProperties druidProperties) {
log.debug("druid web-stat-filter init...");
DruidWebStatProperties properties = druidProperties.getWebStat();
FilterRegistrationBean registration = new FilterRegistrationBean(new WebStatFilter());
druid-spring-boot/druid-spring-boot-starter/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot-starter</artifactId>
druid-spring-boot/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
</parent>
<artifactId>druid-spring-boot</artifactId>
pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.10-SNAPSHOT</version>
<version>1.1.10</version>
<packaging>pom</packaging>
<name>druid-spring-boot-parent</name>