Browse Source

mybatis multi datasouce demo

纯洁的微笑 6 years ago
parent
commit
da902e1e76
35 changed files with 177 additions and 179 deletions
  1. 0 13
      spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties
  2. 0 19
      spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java
  3. 0 19
      spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java
  4. 0 13
      spring-boot-mybatis-mulidatasource/src/main/resources/application.properties
  5. 6 18
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml
  6. 2 3
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java
  7. 1 2
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java
  8. 1 2
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java
  9. 0 0
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java
  10. 5 5
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java
  11. 5 5
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java
  12. 4 4
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java
  13. 7 7
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java
  14. 12 0
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties
  15. 1 1
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java
  16. 6 6
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java
  17. 6 6
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java
  18. 0 0
      spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql
  19. 8 21
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml
  20. 2 3
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java
  21. 1 1
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java
  22. 1 1
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java
  23. 0 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java
  24. 19 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java
  25. 19 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java
  26. 4 4
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java
  27. 7 7
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/web/UserController.java
  28. 11 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties
  29. 3 3
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml
  30. 3 3
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml
  31. 0 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mybatis-config.xml
  32. 1 1
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java
  33. 6 6
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java
  34. 6 6
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java
  35. 30 0
      spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql

+ 0 - 13
spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties

@@ -1,13 +0,0 @@
-mybatis.type-aliases-package=com.neo.entity
-
-spring.datasource.test1.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.test1.url = jdbc:mysql://localhost:3306/test1?useUnicode=true&characterEncoding=utf-8
-spring.datasource.test1.username = root
-spring.datasource.test1.password = root
-
-
-spring.datasource.test2.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.test2.url = jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=utf-8
-spring.datasource.test2.username = root
-spring.datasource.test2.password = root
-

+ 0 - 19
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java

@@ -1,19 +0,0 @@
-package com.neo.mapper.test1;
-
-import com.neo.entity.UserEntity;
-
-import java.util.List;
-
-public interface User1Mapper {
-	
-	List<UserEntity> getAll();
-	
-	UserEntity getOne(Long id);
-
-	void insert(UserEntity user);
-
-	void update(UserEntity user);
-
-	void delete(Long id);
-
-}

+ 0 - 19
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java

@@ -1,19 +0,0 @@
-package com.neo.mapper.test2;
-
-import java.util.List;
-
-import com.neo.entity.UserEntity;
-
-public interface User2Mapper {
-	
-	List<UserEntity> getAll();
-	
-	UserEntity getOne(Long id);
-
-	void insert(UserEntity user);
-
-	void update(UserEntity user);
-
-	void delete(Long id);
-
-}

+ 0 - 13
spring-boot-mybatis-mulidatasource/src/main/resources/application.properties

@@ -1,13 +0,0 @@
-mybatis.config-locations=classpath:mybatis/mybatis-config.xml
-
-spring.datasource.test1.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.test1.url = jdbc:mysql://localhost:3306/test1?useUnicode=true&characterEncoding=utf-8
-spring.datasource.test1.username = root
-spring.datasource.test1.password = root
-
-
-spring.datasource.test2.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.test2.url = jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=utf-8
-spring.datasource.test2.username = root
-spring.datasource.test2.password = root
-

+ 6 - 18
spring-boot-mybatis-annotation-mulidatasource/pom.xml → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.2.RELEASE</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -24,15 +24,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-starter-web</artifactId>
@@ -40,16 +31,16 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.1.1</version>
+			<version>2.0.0</version>
 		</dependency>
 	     <dependency>
 	        <groupId>mysql</groupId>
 	        <artifactId>mysql-connector-java</artifactId>
 	    </dependency>
-	     <dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-devtools</artifactId>
-	        <optional>true</optional>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
@@ -58,9 +49,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-	                <fork>true</fork>
-	            </configuration>
 			</plugin>
 		</plugins>
 	</build>

+ 2 - 3
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/Application.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java

@@ -1,13 +1,12 @@
 package com.neo;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class MAMApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(MAMApplication.class, args);
 	}
 }

+ 1 - 2
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java

@@ -5,12 +5,11 @@ import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 import javax.sql.DataSource;

+ 1 - 2
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java

@@ -5,11 +5,10 @@ import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 import javax.sql.DataSource;

+ 0 - 0
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java


+ 5 - 5
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java

@@ -1,6 +1,6 @@
 package com.neo.mapper.test1;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.enums.UserSexEnum;
 import org.apache.ibatis.annotations.*;
 
@@ -14,20 +14,20 @@ public interface User1Mapper {
 			@Result(property = "userSex",  column = "user_sex", javaType = UserSexEnum.class),
 			@Result(property = "nickName", column = "nick_name")
 	})
-	List<UserEntity> getAll();
+	List<User> getAll();
 
 	@Select("SELECT * FROM users WHERE id = #{id}")
 	@Results({
 			@Result(property = "userSex",  column = "user_sex", javaType = UserSexEnum.class),
 			@Result(property = "nickName", column = "nick_name")
 	})
-	UserEntity getOne(Long id);
+	User getOne(Long id);
 
 	@Insert("INSERT INTO users(userName,passWord,user_sex) VALUES(#{userName}, #{passWord}, #{userSex})")
-	void insert(UserEntity user);
+	void insert(User user);
 
 	@Update("UPDATE users SET userName=#{userName},nick_name=#{nickName} WHERE id =#{id}")
-	void update(UserEntity user);
+	void update(User user);
 
 	@Delete("DELETE FROM users WHERE id =#{id}")
 	void delete(Long id);

+ 5 - 5
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java

@@ -2,7 +2,7 @@ package com.neo.mapper.test2;
 
 import java.util.List;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.enums.UserSexEnum;
 import org.apache.ibatis.annotations.*;
 
@@ -14,20 +14,20 @@ public interface User2Mapper {
 			@Result(property = "userSex",  column = "user_sex", javaType = UserSexEnum.class),
 			@Result(property = "nickName", column = "nick_name")
 	})
-	List<UserEntity> getAll();
+	List<User> getAll();
 
 	@Select("SELECT * FROM users WHERE id = #{id}")
 	@Results({
 			@Result(property = "userSex",  column = "user_sex", javaType = UserSexEnum.class),
 			@Result(property = "nickName", column = "nick_name")
 	})
-	UserEntity getOne(Long id);
+	User getOne(Long id);
 
 	@Insert("INSERT INTO users(userName,passWord,user_sex) VALUES(#{userName}, #{passWord}, #{userSex})")
-	void insert(UserEntity user);
+	void insert(User user);
 
 	@Update("UPDATE users SET userName=#{userName},nick_name=#{nickName} WHERE id =#{id}")
-	void update(UserEntity user);
+	void update(User user);
 
 	@Delete("DELETE FROM users WHERE id =#{id}")
 	void delete(Long id);

+ 4 - 4
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/entity/UserEntity.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java

@@ -1,10 +1,10 @@
-package com.neo.entity;
+package com.neo.model;
 
 import java.io.Serializable;
 
 import com.neo.enums.UserSexEnum;
 
-public class UserEntity implements Serializable {
+public class User implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private Long id;
@@ -13,11 +13,11 @@ public class UserEntity implements Serializable {
 	private UserSexEnum userSex;
 	private String nickName;
 
-	public UserEntity() {
+	public User() {
 		super();
 	}
 
-	public UserEntity(String userName, String passWord, UserSexEnum userSex) {
+	public User(String userName, String passWord, UserSexEnum userSex) {
 		super();
 		this.passWord = passWord;
 		this.userName = userName;

+ 7 - 7
spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java

@@ -3,12 +3,12 @@ package com.neo.web;
 import java.util.List;
 
 import com.neo.mapper.test1.User1Mapper;
+import com.neo.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.neo.entity.UserEntity;
 import com.neo.mapper.test2.User2Mapper;
 
 @RestController
@@ -21,24 +21,24 @@ public class UserController {
 	private User2Mapper user2Mapper;
 	
 	@RequestMapping("/getUsers")
-	public List<UserEntity> getUsers() {
-		List<UserEntity> users=user1Mapper.getAll();
+	public List<User> getUsers() {
+		List<User> users=user1Mapper.getAll();
 		return users;
 	}
 	
     @RequestMapping("/getUser")
-    public UserEntity getUser(Long id) {
-    	UserEntity user=user2Mapper.getOne(id);
+    public User getUser(Long id) {
+    	User user=user2Mapper.getOne(id);
         return user;
     }
     
     @RequestMapping("/add")
-    public void save(UserEntity user) {
+    public void save(User user) {
         user2Mapper.insert(user);
     }
     
     @RequestMapping(value="update")
-    public void update(UserEntity user) {
+    public void update(User user) {
         user2Mapper.update(user);
     }
     

+ 12 - 0
spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties

@@ -0,0 +1,12 @@
+mybatis.type-aliases-package=com.neo.model
+
+spring.datasource.test1.jdbc-url=jdbc:mysql://localhost:3306/test1?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+spring.datasource.test1.username=root
+spring.datasource.test1.password=root
+spring.datasource.test1.driver-class-name=com.mysql.cj.jdbc.Driver
+
+spring.datasource.test2.jdbc-url=jdbc:mysql://localhost:3306/test2?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+spring.datasource.test2.username=root
+spring.datasource.test2.password=root
+spring.datasource.test2.driver-class-name=com.mysql.cj.jdbc.Driver
+

+ 1 - 1
spring-boot-mybatis-mulidatasource/src/test/java/com/neo/ApplicationTests.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ApplicationTests {
+public class MAMApplicationTests {
 
 	@Test
 	public void contextLoads() {

+ 6 - 6
spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java

@@ -3,6 +3,7 @@ package com.neo.mapper;
 import java.util.List;
 
 import com.neo.mapper.test1.User1Mapper;
+import com.neo.model.User;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.neo.entity.UserEntity;
 import com.neo.enums.UserSexEnum;
 
 @RunWith(SpringRunner.class)
@@ -22,16 +22,16 @@ public class User1MapperTest {
 
 	@Test
 	public void testInsert() throws Exception {
-		userMapper.insert(new UserEntity("aa", "a123456", UserSexEnum.MAN));
-		userMapper.insert(new UserEntity("bb", "b123456", UserSexEnum.WOMAN));
-		userMapper.insert(new UserEntity("cc", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("aa", "a123456", UserSexEnum.MAN));
+		userMapper.insert(new User("bb", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("cc", "b123456", UserSexEnum.WOMAN));
 
 		Assert.assertEquals(3, userMapper.getAll().size());
 	}
 
 	@Test
 	public void testQuery() throws Exception {
-		List<UserEntity> users = userMapper.getAll();
+		List<User> users = userMapper.getAll();
 		if(users==null || users.size()==0){
 			System.out.println("is null");
 		}else{
@@ -42,7 +42,7 @@ public class User1MapperTest {
 	
 	@Test
 	public void testUpdate() throws Exception {
-		UserEntity user = userMapper.getOne(6l);
+		User user = userMapper.getOne(6l);
 		System.out.println(user.toString());
 		user.setNickName("neo");
 		userMapper.update(user);

+ 6 - 6
spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java

@@ -1,6 +1,6 @@
 package com.neo.mapper;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.enums.UserSexEnum;
 import com.neo.mapper.test2.User2Mapper;
 import org.junit.Assert;
@@ -21,16 +21,16 @@ public class User2MapperTest {
 
 	@Test
 	public void testInsert() throws Exception {
-		userMapper.insert(new UserEntity("aa", "a123456", UserSexEnum.MAN));
-		userMapper.insert(new UserEntity("bb", "b123456", UserSexEnum.WOMAN));
-		userMapper.insert(new UserEntity("cc", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("aa", "a123456", UserSexEnum.MAN));
+		userMapper.insert(new User("bb", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("cc", "b123456", UserSexEnum.WOMAN));
 
 		Assert.assertEquals(3, userMapper.getAll().size());
 	}
 
 	@Test
 	public void testQuery() throws Exception {
-		List<UserEntity> users = userMapper.getAll();
+		List<User> users = userMapper.getAll();
 		if(users==null || users.size()==0){
 			System.out.println("is null");
 		}else{
@@ -41,7 +41,7 @@ public class User2MapperTest {
 	
 	@Test
 	public void testUpdate() throws Exception {
-		UserEntity user = userMapper.getOne(6l);
+		User user = userMapper.getOne(6l);
 		System.out.println(user.toString());
 		user.setNickName("neo");
 		userMapper.update(user);

+ 0 - 0
spring-boot-mybatis-mulidatasource/users.sql → spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql


+ 8 - 21
spring-boot-mybatis-mulidatasource/pom.xml → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml

@@ -4,17 +4,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.neo</groupId>
-	<artifactId>spring-boot-mybatis-mulidatasource</artifactId>
+	<artifactId>spring-boot-mybatis-xml-mulidatasource</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
 
-	<name>spring-boot-mybatis-mulidatasource</name>
+	<name>spring-boot-mybatis-xml-mulidatasource</name>
 	<description>Demo project for Spring Boot and mybatis</description>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.2.RELEASE</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -24,15 +24,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-starter-web</artifactId>
@@ -40,16 +31,16 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.1.1</version>
+			<version>2.0.0</version>
 		</dependency>
 	     <dependency>
 	        <groupId>mysql</groupId>
 	        <artifactId>mysql-connector-java</artifactId>
 	    </dependency>
-	     <dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-devtools</artifactId>
-	        <optional>true</optional>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
@@ -58,12 +49,8 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-	                <fork>true</fork>
-	            </configuration>
 			</plugin>
 		</plugins>
 	</build>
 	
-
 </project>

+ 2 - 3
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/Application.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java

@@ -1,13 +1,12 @@
 package com.neo;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class MXMApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
+		SpringApplication.run(MXMApplication.class, args);
 	}
 }

+ 1 - 1
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java

@@ -5,8 +5,8 @@ import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

+ 1 - 1
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java

@@ -5,8 +5,8 @@ import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;

+ 0 - 0
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java


+ 19 - 0
spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java

@@ -0,0 +1,19 @@
+package com.neo.mapper.test1;
+
+import com.neo.model.User;
+
+import java.util.List;
+
+public interface User1Mapper {
+	
+	List<User> getAll();
+	
+	User getOne(Long id);
+
+	void insert(User user);
+
+	void update(User user);
+
+	void delete(Long id);
+
+}

+ 19 - 0
spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java

@@ -0,0 +1,19 @@
+package com.neo.mapper.test2;
+
+import java.util.List;
+
+import com.neo.model.User;
+
+public interface User2Mapper {
+	
+	List<User> getAll();
+	
+	User getOne(Long id);
+
+	void insert(User user);
+
+	void update(User user);
+
+	void delete(Long id);
+
+}

+ 4 - 4
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/entity/UserEntity.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java

@@ -1,10 +1,10 @@
-package com.neo.entity;
+package com.neo.model;
 
 import java.io.Serializable;
 
 import com.neo.enums.UserSexEnum;
 
-public class UserEntity implements Serializable {
+public class User implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	private Long id;
@@ -13,11 +13,11 @@ public class UserEntity implements Serializable {
 	private UserSexEnum userSex;
 	private String nickName;
 
-	public UserEntity() {
+	public User() {
 		super();
 	}
 
-	public UserEntity(String userName, String passWord, UserSexEnum userSex) {
+	public User(String userName, String passWord, UserSexEnum userSex) {
 		super();
 		this.passWord = passWord;
 		this.userName = userName;

+ 7 - 7
spring-boot-mybatis-mulidatasource/src/main/java/com/neo/web/UserController.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/web/UserController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.mapper.test2.User2Mapper;
 
 @RestController
@@ -21,24 +21,24 @@ public class UserController {
 	private User2Mapper user2Mapper;
 	
 	@RequestMapping("/getUsers")
-	public List<UserEntity> getUsers() {
-		List<UserEntity> users=user1Mapper.getAll();
+	public List<User> getUsers() {
+		List<User> users=user1Mapper.getAll();
 		return users;
 	}
 	
     @RequestMapping("/getUser")
-    public UserEntity getUser(Long id) {
-    	UserEntity user=user2Mapper.getOne(id);
+    public User getUser(Long id) {
+    	User user=user2Mapper.getOne(id);
         return user;
     }
     
     @RequestMapping("/add")
-    public void save(UserEntity user) {
+    public void save(User user) {
         user2Mapper.insert(user);
     }
     
     @RequestMapping(value="update")
-    public void update(UserEntity user) {
+    public void update(User user) {
         user2Mapper.update(user);
     }
     

+ 11 - 0
spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties

@@ -0,0 +1,11 @@
+mybatis.config-location=classpath:mybatis/mybatis-config.xml
+
+spring.datasource.test1.jdbc-url=jdbc:mysql://localhost:3306/test1?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+spring.datasource.test1.username=root
+spring.datasource.test1.password=root
+spring.datasource.test1.driver-class-name=com.mysql.cj.jdbc.Driver
+
+spring.datasource.test2.jdbc-url=jdbc:mysql://localhost:3306/test2?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+spring.datasource.test2.username=root
+spring.datasource.test2.password=root
+spring.datasource.test2.driver-class-name=com.mysql.cj.jdbc.Driver

+ 3 - 3
spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.neo.mapper.test1.User1Mapper" >
-    <resultMap id="BaseResultMap" type="com.neo.entity.UserEntity" >
+    <resultMap id="BaseResultMap" type="com.neo.model.User" >
         <id column="id" property="id" jdbcType="BIGINT" />
         <result column="userName" property="userName" jdbcType="VARCHAR" />
         <result column="passWord" property="passWord" jdbcType="VARCHAR" />
@@ -26,7 +26,7 @@
 	   WHERE id = #{id}
     </select>
 
-    <insert id="insert" parameterType="com.neo.entity.UserEntity" >
+    <insert id="insert" parameterType="com.neo.model.User" >
        INSERT INTO 
        		users
        		(userName,passWord,user_sex) 
@@ -34,7 +34,7 @@
        		(#{userName}, #{passWord}, #{userSex})
     </insert>
     
-    <update id="update" parameterType="com.neo.entity.UserEntity" >
+    <update id="update" parameterType="com.neo.model.User" >
        UPDATE 
        		users 
        SET 

+ 3 - 3
spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.neo.mapper.test2.User2Mapper" >
-    <resultMap id="BaseResultMap" type="com.neo.entity.UserEntity" >
+    <resultMap id="BaseResultMap" type="com.neo.model.User" >
         <id column="id" property="id" jdbcType="BIGINT" />
         <result column="userName" property="userName" jdbcType="VARCHAR" />
         <result column="passWord" property="passWord" jdbcType="VARCHAR" />
@@ -26,7 +26,7 @@
 	   WHERE id = #{id}
     </select>
 
-    <insert id="insert" parameterType="com.neo.entity.UserEntity" >
+    <insert id="insert" parameterType="com.neo.model.User" >
        INSERT INTO 
        		users
        		(userName,passWord,user_sex) 
@@ -34,7 +34,7 @@
        		(#{userName}, #{passWord}, #{userSex})
     </insert>
     
-    <update id="update" parameterType="com.neo.entity.UserEntity" >
+    <update id="update" parameterType="com.neo.model.User" >
        UPDATE 
        		users 
        SET 

+ 0 - 0
spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mybatis-config.xml → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mybatis-config.xml


+ 1 - 1
spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/ApplicationTests.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class ApplicationTests {
+public class MXMApplicationTests {
 
 	@Test
 	public void contextLoads() {

+ 6 - 6
spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java

@@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.enums.UserSexEnum;
 
 @RunWith(SpringRunner.class)
@@ -22,16 +22,16 @@ public class User1MapperTest {
 
 	@Test
 	public void testInsert() throws Exception {
-		userMapper.insert(new UserEntity("aa", "a123456", UserSexEnum.MAN));
-		userMapper.insert(new UserEntity("bb", "b123456", UserSexEnum.WOMAN));
-		userMapper.insert(new UserEntity("cc", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("aa", "a123456", UserSexEnum.MAN));
+		userMapper.insert(new User("bb", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("cc", "b123456", UserSexEnum.WOMAN));
 
 		Assert.assertEquals(3, userMapper.getAll().size());
 	}
 
 	@Test
 	public void testQuery() throws Exception {
-		List<UserEntity> users = userMapper.getAll();
+		List<User> users = userMapper.getAll();
 		if(users==null || users.size()==0){
 			System.out.println("is null");
 		}else{
@@ -42,7 +42,7 @@ public class User1MapperTest {
 	
 	@Test
 	public void testUpdate() throws Exception {
-		UserEntity user = userMapper.getOne(6l);
+		User user = userMapper.getOne(6l);
 		System.out.println(user.toString());
 		user.setNickName("neo");
 		userMapper.update(user);

+ 6 - 6
spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java → spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java

@@ -1,6 +1,6 @@
 package com.neo.mapper;
 
-import com.neo.entity.UserEntity;
+import com.neo.model.User;
 import com.neo.enums.UserSexEnum;
 import com.neo.mapper.test2.User2Mapper;
 import org.junit.Assert;
@@ -21,16 +21,16 @@ public class User2MapperTest {
 
 	@Test
 	public void testInsert() throws Exception {
-		userMapper.insert(new UserEntity("aa", "a123456", UserSexEnum.MAN));
-		userMapper.insert(new UserEntity("bb", "b123456", UserSexEnum.WOMAN));
-		userMapper.insert(new UserEntity("cc", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("aa", "a123456", UserSexEnum.MAN));
+		userMapper.insert(new User("bb", "b123456", UserSexEnum.WOMAN));
+		userMapper.insert(new User("cc", "b123456", UserSexEnum.WOMAN));
 
 		Assert.assertEquals(3, userMapper.getAll().size());
 	}
 
 	@Test
 	public void testQuery() throws Exception {
-		List<UserEntity> users = userMapper.getAll();
+		List<User> users = userMapper.getAll();
 		if(users==null || users.size()==0){
 			System.out.println("is null");
 		}else{
@@ -41,7 +41,7 @@ public class User2MapperTest {
 	
 	@Test
 	public void testUpdate() throws Exception {
-		UserEntity user = userMapper.getOne(6l);
+		User user = userMapper.getOne(6l);
 		System.out.println(user.toString());
 		user.setNickName("neo");
 		userMapper.update(user);

+ 30 - 0
spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql

@@ -0,0 +1,30 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 本地
+Source Server Version : 50505
+Source Host           : localhost:3306
+Source Database       : test1
+
+Target Server Type    : MYSQL
+Target Server Version : 50505
+File Encoding         : 65001
+
+Date: 2016-11-05 21:17:33
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for `users`
+-- ----------------------------
+DROP TABLE IF EXISTS `users`;
+CREATE TABLE `users` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `userName` varchar(32) DEFAULT NULL COMMENT '用户名',
+  `passWord` varchar(32) DEFAULT NULL COMMENT '密码',
+  `user_sex` varchar(32) DEFAULT NULL,
+  `nick_name` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8;
+