From 60e91f7ee045579762ac245a590f0f49d5f51646 Mon Sep 17 00:00:00 2001
From: JeffLi1993 <qiangqiangli1993@gmail.com>
Date: Thu, 23 Mar 2017 17:43:30 +0800
Subject: [PATCH] =?UTF-8?q?Spring=20Boot=20=E6=95=B4=E5=90=88=20Mybatis=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=20Druid=20=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 springboot-mybatis-mutil-datasource/pom.xml        | 14 +++++++-------
 .../config/ds/ClusterDataSourceConfig.java         |  1 +
 .../config/ds/MasterDataSourceConfig.java          |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/springboot-mybatis-mutil-datasource/pom.xml b/springboot-mybatis-mutil-datasource/pom.xml
index 9dc6a35..bc14a53 100755
--- a/springboot-mybatis-mutil-datasource/pom.xml
+++ b/springboot-mybatis-mutil-datasource/pom.xml
@@ -43,13 +43,6 @@
             <version>${mybatis-spring-boot}</version>
         </dependency>
 
-        <!-- Druid 数据连接池依赖 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>${druid}</version>
-        </dependency>
-
         <!-- MySQL 连接驱动依赖 -->
         <dependency>
             <groupId>mysql</groupId>
@@ -57,6 +50,13 @@
             <version>${mysql-connector}</version>
         </dependency>
 
+        <!-- Druid 数据连接池依赖 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${druid}</version>
+        </dependency>
+
         <!-- Junit -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/ClusterDataSourceConfig.java b/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/ClusterDataSourceConfig.java
index acc6584..fd85232 100644
--- a/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/ClusterDataSourceConfig.java
+++ b/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/ClusterDataSourceConfig.java
@@ -18,6 +18,7 @@ import javax.sql.DataSource;
 // 扫描 Mapper 接口并容器管理
 @MapperScan(basePackages = ClusterDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "clusterSqlSessionFactory")
 public class ClusterDataSourceConfig {
+
     // 精确到 cluster 目录，以便跟其他数据源隔离
     static final String PACKAGE = "org.spring.springboot.dao.cluster";
     static final String MAPPER_LOCATION = "classpath:mapper/cluster/*.xml";
diff --git a/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/MasterDataSourceConfig.java b/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/MasterDataSourceConfig.java
index 4623a8a..cec5545 100644
--- a/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/MasterDataSourceConfig.java
+++ b/springboot-mybatis-mutil-datasource/src/main/java/org/spring/springboot/config/ds/MasterDataSourceConfig.java
@@ -19,6 +19,7 @@ import javax.sql.DataSource;
 // 扫描 Mapper 接口并容器管理
 @MapperScan(basePackages = MasterDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory")
 public class MasterDataSourceConfig {
+
     // 精确到 master 目录，以便跟其他数据源隔离
     static final String PACKAGE = "org.spring.springboot.dao.master";
     static final String MAPPER_LOCATION = "classpath:mapper/master/*.xml";