spring boot 2.x

This commit is contained in:
trang
2018-03-11 10:47:36 +08:00
parent 16b7133b85
commit 6e4a1a9314
67 changed files with 69 additions and 61 deletions
+1 -1
View File
@@ -7,5 +7,5 @@ cache:
directories:
- $HOME/.m2/repository
after_success:
- cd druid-spring-boot-example/druid-spring-boot-mybatis-example
- cd druid-spring-boot2-example/druid-spring-boot2-mybatis-example
- mvn clean test -Pcoveralls jacoco:report coveralls:report
+1 -1
View File
@@ -8,7 +8,7 @@
### Enhancements
1. 新增基于 JPA 的代码示例
2. 改进 DruidDataSourceInitializer,支持多数据源的 SQL 初始化
3. 改进自动提示,新增大量精准提示,详情见 [additional-spring-configuration-metadata.json](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json)
3. 改进自动提示,新增大量精准提示,详情见 [additional-spring-configuration-metadata.json](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json)
### Bug Fixes
1. 修复代码覆盖率显示异常的 bug
+13 -5
View File
@@ -11,10 +11,18 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
## 依赖
```xml
<!-- spring boot 1.x -->
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.7</version>
<version>1.1.8</version>
</dependency>
<!-- spring boot 2.x -->
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>1.1.8</version>
</dependency>
```
@@ -25,7 +33,7 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
## NEW !
1. 改进多数据源的声明方式,由 Starter 自动发现配置并注册到 ApplicationContext,详情请查看 [Druid 多数据源支持.md](https://github.com/drtrang/druid-spring-boot/tree/master/docs/Druid%20%E5%A4%9A%E6%95%B0%E6%8D%AE%E6%BA%90%E6%94%AF%E6%8C%81.md)
1. 新增全配置说明 [druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml)
1. 新增全配置说明 [druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml)
2. 新增 `druid-spring-boot-actuator-starter`
@@ -112,10 +120,10 @@ spring:
```
### 配置示例
[application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml)
[application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml)
### 全配置说明
[druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml)
[druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml)
## 自动提示
@@ -132,7 +140,7 @@ Druid Spring Boot Starter 基于 `spring-boot-configuration-processor` 模块,
## 演示
[druid-spring-boot-example](https://github.com/drtrang/druid-spring-boot/tree/master/druid-spring-boot-example) 中演示了 Druid Spring Boot Starter 的使用方式,可以作为参考。
[druid-spring-boot2-example](https://github.com/drtrang/druid-spring-boot/tree/master/druid-spring-boot2-example) 中演示了 Druid Spring Boot Starter 的使用方式,可以作为参考。
## Change Log
+1 -1
View File
@@ -98,4 +98,4 @@ Starter 判断是否多数据源的条件是 application 文件中是否存在 `
## 演示
将 [druid-spring-boot-mybatis-example](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可。
将 [druid-spring-boot2-mybatis-example](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可。
@@ -1 +0,0 @@
provides: druid,druid-spring-boot-actuator,druid-spring-boot-actuator-autoconfigure,slf4j-api
@@ -1 +0,0 @@
provides: druid,druid-spring-boot-autoconfigure,spring-boot-autoconfigure,spring-jdbc,slf4j-api
@@ -6,11 +6,11 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-actuator</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-actuator-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-actuator-autoconfigure</artifactId>
<dependencies>
<dependency>
@@ -6,16 +6,16 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-actuator</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-actuator-starter</artifactId>
<artifactId>druid-spring-boot2-actuator-starter</artifactId>
<dependencies>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-actuator-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -0,0 +1 @@
provides: druid,druid-spring-boot2-actuator,druid-spring-boot2-actuator-autoconfigure,slf4j-api
@@ -6,16 +6,16 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-parent</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-actuator</artifactId>
<artifactId>druid-spring-boot2-actuator</artifactId>
<packaging>pom</packaging>
<modules>
<module>druid-spring-boot-actuator-autoconfigure</module>
<module>druid-spring-boot-actuator-starter</module>
<module>druid-spring-boot2-actuator-autoconfigure</module>
<module>druid-spring-boot2-actuator-starter</module>
</modules>
</project>
@@ -6,11 +6,11 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-example</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-example</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-jpa-example</artifactId>
<artifactId>druid-spring-boot2-jpa-example</artifactId>
<dependencies>
<dependency>
@@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot2-starter</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -10,7 +10,7 @@ logging:
spring:
application:
name: druid-spring-boot-jpa-example
name: druid-spring-boot2-jpa-example
profiles:
# 默认环境为 default,多数据源演示请改为 dynamic
# active: dynamic
@@ -2,4 +2,4 @@
Druid Spring Boot Example 项目演示了 Druid Spring Boot Starter 的使用方式。将项目导入 IDE 后,直接运行 `com.github.trang.druid.DruidSpringBootStarterApplication#main()` 即可,无需依赖其它环境。
项目默认使用单数据源,将 [application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可切换为多数据源演示。
项目默认使用单数据源,将 [application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可切换为多数据源演示。
@@ -6,11 +6,11 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-example</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-example</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-mybatis-example</artifactId>
<artifactId>druid-spring-boot2-mybatis-example</artifactId>
<dependencies>
<dependency>
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot2-starter</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -11,7 +11,7 @@ logging:
spring:
application:
name: druid-spring-boot-mybatis-example
name: druid-spring-boot2-mybatis-example
profiles:
# 默认环境为 default,多数据源演示请改为 dynamic
# active: dynamic
@@ -6,16 +6,16 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-parent</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-example</artifactId>
<artifactId>druid-spring-boot2-example</artifactId>
<packaging>pom</packaging>
<modules>
<module>druid-spring-boot-mybatis-example</module>
<module>druid-spring-boot-jpa-example</module>
<module>druid-spring-boot2-mybatis-example</module>
<module>druid-spring-boot2-jpa-example</module>
</modules>
</project>
@@ -6,11 +6,11 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-autoconfigure</artifactId>
<dependencies>
<dependency>
@@ -6,16 +6,16 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot2-starter</artifactId>
<dependencies>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -0,0 +1 @@
provides: druid,druid-spring-boot2-autoconfigure,spring-boot2-autoconfigure,spring-jdbc,slf4j-api
@@ -6,16 +6,16 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-parent</artifactId>
<version>1.1.8</version>
</parent>
<artifactId>druid-spring-boot</artifactId>
<artifactId>druid-spring-boot2</artifactId>
<packaging>pom</packaging>
<modules>
<module>druid-spring-boot-autoconfigure</module>
<module>druid-spring-boot-starter</module>
<module>druid-spring-boot2-autoconfigure</module>
<module>druid-spring-boot2-starter</module>
</modules>
</project>
+11 -11
View File
@@ -5,13 +5,13 @@
<parent>
<groupId>com.github.drtrang</groupId>
<artifactId>parent</artifactId>
<version>1.1.1-SNAPSHOT</version>
<artifactId>parent2</artifactId>
<version>1.1.1</version>
</parent>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-parent</artifactId>
<version>1.1.8-SNAPSHOT</version>
<artifactId>druid-spring-boot2-parent</artifactId>
<version>1.1.8</version>
<packaging>pom</packaging>
<name>Druid Spring Boot Starter</name>
@@ -50,9 +50,9 @@
</issueManagement>
<modules>
<module>druid-spring-boot</module>
<module>druid-spring-boot-actuator</module>
<module>druid-spring-boot-example</module>
<module>druid-spring-boot2</module>
<module>druid-spring-boot2-actuator</module>
<module>druid-spring-boot2-example</module>
</modules>
<properties>
@@ -63,22 +63,22 @@
<dependencies>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot2-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator-autoconfigure</artifactId>
<artifactId>druid-spring-boot2-actuator-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.drtrang</groupId>
<artifactId>druid-spring-boot-actuator-starter</artifactId>
<artifactId>druid-spring-boot2-actuator-starter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>