Skip to content

Commit 30ac101

Browse files
hengboyhengboy
committed
Move "api-boot-plugin-datasource-switch" to "api-boot"
1 parent 965951e commit 30ac101

File tree

26 files changed

+80
-121
lines changed

26 files changed

+80
-121
lines changed

‎api-boot-project/api-boot-autoconfigure/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@
133133
<artifactId>druid</artifactId>
134134
<optional>true</optional>
135135
</dependency>
136-
<dependency>
137-
<groupId>${project.groupId}</groupId>
138-
<artifactId>api-boot-plugin-datasource-switch</artifactId>
139-
<optional>true</optional>
140-
</dependency>
141136

142137
<!--ApiBoot Resource Load-->
143138
<dependency>

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/datasource/ApiBootDataSourceSwitchAutoConfiguration.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.minbox.framework.api.boot.autoconfigure.datasource;
22

3-
import org.minbox.framework.api.boot.plugin.datasource.ApiBootDataSource;
4-
import org.minbox.framework.api.boot.plugin.datasource.ApiBootDataSourceFactoryBean;
5-
import org.minbox.framework.api.boot.plugin.datasource.aop.advistor.ApiBootDataSourceSwitchAdvisor;
6-
import org.minbox.framework.api.boot.plugin.datasource.aop.interceptor.ApiBootDataSourceSwitchAnnotationInterceptor;
7-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceConfig;
8-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceDruidConfig;
9-
import org.minbox.framework.api.boot.plugin.datasource.routing.ApiBootRoutingDataSource;
10-
import org.minbox.framework.api.boot.plugin.datasource.support.ApiBootDruidDataSource;
11-
import org.minbox.framework.api.boot.plugin.datasource.support.ApiBootHikariDataSource;
3+
import org.minbox.framework.api.boot.datasource.ApiBootDataSource;
4+
import org.minbox.framework.api.boot.datasource.ApiBootDataSourceFactoryBean;
5+
import org.minbox.framework.api.boot.datasource.aop.advistor.ApiBootDataSourceSwitchAdvisor;
6+
import org.minbox.framework.api.boot.datasource.aop.interceptor.ApiBootDataSourceSwitchAnnotationInterceptor;
7+
import org.minbox.framework.api.boot.datasource.config.DataSourceConfig;
8+
import org.minbox.framework.api.boot.datasource.config.DataSourceDruidConfig;
9+
import org.minbox.framework.api.boot.datasource.routing.ApiBootRoutingDataSource;
10+
import org.minbox.framework.api.boot.datasource.support.ApiBootDruidDataSource;
11+
import org.minbox.framework.api.boot.datasource.support.ApiBootHikariDataSource;
1212
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1414
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

‎api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/datasource/ApiBootDataSourceSwitchProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.minbox.framework.api.boot.autoconfigure.datasource;
22

33
import lombok.Data;
4-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceDruidConfig;
5-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceHikariConfig;
4+
import org.minbox.framework.api.boot.datasource.config.DataSourceDruidConfig;
5+
import org.minbox.framework.api.boot.datasource.config.DataSourceHikariConfig;
66
import org.springframework.boot.context.properties.ConfigurationProperties;
77
import org.springframework.context.annotation.Configuration;
88

‎api-boot-project/api-boot-dependencies/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@
263263
</dependency>
264264

265265
<!--ApiBoot DataSource Switch-->
266-
<dependency>
267-
<groupId>org.minbox.framework</groupId>
268-
<artifactId>api-boot-plugin-datasource-switch</artifactId>
269-
<version>${project.version}</version>
270-
</dependency>
271266
<dependency>
272267
<groupId>org.minbox.framework</groupId>
273268
<artifactId>api-boot-starter-datasource-switch</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch/pom.xml‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎api-boot-project/api-boot-plugins/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<module>api-boot-plugin-security</module>
2323
<module>api-boot-plugin-oauth</module>
2424
<module>api-boot-plugin-quartz</module>
25-
<module>api-boot-plugin-datasource-switch</module>
2625
<module>api-boot-plugin-resource-load</module>
2726
<module>api-boot-plugin-http-converter</module>
2827
<module>api-boot-plugin-message-push</module>

‎api-boot-project/api-boot-starters/api-boot-starter-datasource-switch/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
<groupId>org.minbox.framework</groupId>
3333
<artifactId>api-boot-starter</artifactId>
3434
</dependency>
35-
<!--ApiBoot DataSource Switch Plugin-->
36-
<dependency>
37-
<groupId>org.minbox.framework</groupId>
38-
<artifactId>api-boot-plugin-datasource-switch</artifactId>
39-
</dependency>
4035
<!--SpringBoot Jdbc-->
4136
<dependency>
4237
<groupId>org.springframework.boot</groupId>

‎api-boot-project/api-boot/pom.xml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,49 @@
1515
<name>ApiBoot</name>
1616
<artifactId>api-boot</artifactId>
1717
<dependencies>
18+
<!--ApiBoot-->
1819
<dependency>
1920
<groupId>org.minbox.framework</groupId>
2021
<artifactId>api-boot-common</artifactId>
2122
<optional>true</optional>
2223
</dependency>
24+
25+
<!--Spring-->
2326
<dependency>
2427
<groupId>org.springframework</groupId>
2528
<artifactId>spring-core</artifactId>
2629
<optional>true</optional>
2730
</dependency>
28-
<!--alibaba oss-->
31+
32+
<!--Spring Boot-->
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-jdbc</artifactId>
36+
<optional>true</optional>
37+
</dependency>
38+
39+
<!--Others-->
40+
<dependency>
41+
<groupId>org.projectlombok</groupId>
42+
<artifactId>lombok</artifactId>
43+
<scope>compile</scope>
44+
<optional>true</optional>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.zaxxer</groupId>
48+
<artifactId>HikariCP</artifactId>
49+
<optional>true</optional>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.alibaba</groupId>
53+
<artifactId>druid</artifactId>
54+
<optional>true</optional>
55+
</dependency>
2956
<dependency>
3057
<groupId>com.aliyun.oss</groupId>
3158
<artifactId>aliyun-sdk-oss</artifactId>
3259
<optional>true</optional>
3360
</dependency>
34-
<!--Aliyun mail-->
3561
<dependency>
3662
<groupId>com.aliyun</groupId>
3763
<artifactId>aliyun-java-sdk-core</artifactId>
@@ -47,12 +73,6 @@
4773
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
4874
<optional>true</optional>
4975
</dependency>
50-
<dependency>
51-
<groupId>org.projectlombok</groupId>
52-
<artifactId>lombok</artifactId>
53-
<scope>compile</scope>
54-
<optional>true</optional>
55-
</dependency>
5676
<dependency>
5777
<groupId>com.alibaba</groupId>
5878
<artifactId>fastjson</artifactId>

‎api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch/src/main/java/org/minbox/framework/api/boot/plugin/datasource/ApiBootDataSource.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/datasource/ApiBootDataSource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.minbox.framework.api.boot.plugin.datasource;
1+
package org.minbox.framework.api.boot.datasource;
22

33
import org.minbox.framework.api.boot.common.exception.ApiBootException;
44

‎api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch/src/main/java/org/minbox/framework/api/boot/plugin/datasource/ApiBootDataSourceFactoryBean.java‎ renamed to ‎api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/datasource/ApiBootDataSourceFactoryBean.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.minbox.framework.api.boot.plugin.datasource;
1+
package org.minbox.framework.api.boot.datasource;
22

3-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceConfig;
4-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceDruidConfig;
5-
import org.minbox.framework.api.boot.plugin.datasource.config.DataSourceHikariConfig;
6-
import org.minbox.framework.api.boot.plugin.datasource.support.ApiBootBasicDataSource;
7-
import org.minbox.framework.api.boot.plugin.datasource.support.ApiBootDruidDataSource;
8-
import org.minbox.framework.api.boot.plugin.datasource.support.ApiBootHikariDataSource;
3+
import org.minbox.framework.api.boot.datasource.config.DataSourceConfig;
4+
import org.minbox.framework.api.boot.datasource.config.DataSourceDruidConfig;
5+
import org.minbox.framework.api.boot.datasource.config.DataSourceHikariConfig;
6+
import org.minbox.framework.api.boot.datasource.support.ApiBootBasicDataSource;
7+
import org.minbox.framework.api.boot.datasource.support.ApiBootDruidDataSource;
8+
import org.minbox.framework.api.boot.datasource.support.ApiBootHikariDataSource;
99

1010
import javax.sql.DataSource;
1111

0 commit comments

Comments
 (0)