Merge pull request #53 from hengboy/2.3.x

Exclude default data source: HikariCP

Author: hengboy

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

@@ -34,6 +34,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>HikariCP</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

api-boot-samples/api-boot-sample-datasource-switch/pom.xml

@@ -21,6 +21,17 @@
         <dependency>
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter-datasource-switch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.minbox.framework</groupId>
+                    <artifactId>minbox-datasource-switch</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>minbox-datasource-switch</artifactId>
+            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <!--SpringBoot Test-->
         <dependency>
@@ -32,6 +43,14 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
         <!--性能测试依赖-->
         <dependency>
             <groupId>org.databene</groupId>

api-boot-samples/api-boot-sample-datasource-switch/src/main/resources/application.yml

@@ -6,8 +6,14 @@ api:
     datasource:
       # 默认的数据源，默认值为master
       primary: master
-      # 配置使用hikari数据源
       hikari:
+        # slave 2
+        slave_2:
+          url: jdbc:mysql://localhost:3306/iot-logging?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+          username: root
+          password: 123456
+      # 配置使用hikari数据源
+      druid:
         # master datasource config
         master:
           url: jdbc:mysql://localhost:3306/test?characterEncoding=utf8&serverTimezone=Asia/Shanghai
@@ -20,8 +26,3 @@ api:
           url: jdbc:mysql://localhost:3306/iot-oauth?characterEncoding=utf8&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
-        # slave 2
-        slave_2:
-          url: jdbc:mysql://localhost:3306/iot-logging?characterEncoding=utf8&serverTimezone=Asia/Shanghai
-          username: root
-          password: 123456