diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties b/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties deleted file mode 100644 index 35b74f13c3e5f26b0c43ec52c774044fde5ad95f..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties +++ /dev/null @@ -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 - diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java b/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java deleted file mode 100644 index 424a30d98df72410cad605a6ec010828b37f832e..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.neo.mapper.test1; - -import com.neo.entity.UserEntity; - -import java.util.List; - -public interface User1Mapper { - - List getAll(); - - UserEntity getOne(Long id); - - void insert(UserEntity user); - - void update(UserEntity user); - - void delete(Long id); - -} \ No newline at end of file diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java b/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java deleted file mode 100644 index c3c05258542789557a6a86d180dba721f3c37ff0..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.neo.mapper.test2; - -import java.util.List; - -import com.neo.entity.UserEntity; - -public interface User2Mapper { - - List getAll(); - - UserEntity getOne(Long id); - - void insert(UserEntity user); - - void update(UserEntity user); - - void delete(Long id); - -} \ No newline at end of file diff --git a/spring-boot-mybatis-mulidatasource/src/main/resources/application.properties b/spring-boot-mybatis-mulidatasource/src/main/resources/application.properties deleted file mode 100644 index 2447cd1cd7bfeb28f258dc7f78f2a9e7afa48f7b..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-mulidatasource/src/main/resources/application.properties +++ /dev/null @@ -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 - diff --git a/spring-boot-mybatis-annotation-mulidatasource/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml similarity index 78% rename from spring-boot-mybatis-annotation-mulidatasource/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml index 289365a64dc84b9fe53f0910eeabc40e8d5f076a..fc8412fd3a29fa0049d9b671281c296c9bc7c13f 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/pom.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.1.0.RELEASE @@ -24,15 +24,6 @@ - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-web @@ -40,16 +31,16 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.1.1 + 2.0.0 mysql mysql-connector-java - - org.springframework.boot - spring-boot-devtools - true + + org.springframework.boot + spring-boot-starter-test + test @@ -58,9 +49,6 @@ org.springframework.boot spring-boot-maven-plugin - - true - diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/Application.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java similarity index 62% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/Application.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java index 8b612caa18942ea740a2f1655ee60e5510fee372..a77fe795e0d6a94b477e91bc1d8a6d4e915c2922 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/Application.java +++ b/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); } } diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java similarity index 92% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java index aef652c9466d1b81ce6a99aa6ba305c1dc40f81c..2db7d6533eeb9b06a7fd931c4daf779794256bdd 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java +++ b/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; diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java similarity index 92% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java index 50e6a86716ad40b7f65dfab363070a43f854c2a1..e52928c4393a4cfa5e01a34e161e5deb64006221 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java +++ b/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; diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java similarity index 100% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java similarity index 84% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java index 945d8c2d4d69eedb6c9573fbd1de422a4f7f268c..6ab2e6a09353da77e3b4eefb13a3483a7be9fed9 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java +++ b/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 getAll(); + List 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); diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java similarity index 84% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java index 91376fa9153fcc839e7dcfa8e5baacf369aa0380..50c5c855d7a8e8887993e09c6885141606fd85e4 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java +++ b/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 getAll(); + List 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); diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/entity/UserEntity.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java similarity index 86% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/entity/UserEntity.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java index 9bb3497599cb0b49ee21e0bacd68abb1c44eecff..de501655b46e0afe30fda644de09042b34fa6729 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/entity/UserEntity.java +++ b/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; diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java similarity index 76% rename from spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java index 684a48469260dbb50cda60ed0a6954a6cd3903fa..c92c15d6605d0633e9d53805dbe3b67d18e97d50 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java +++ b/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 getUsers() { - List users=user1Mapper.getAll(); + public List getUsers() { + List 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); } diff --git a/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..819d06c9228cbaacb371657bb10031b33a2641d3 --- /dev/null +++ b/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 + diff --git a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/ApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java similarity index 90% rename from spring-boot-mybatis-mulidatasource/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java index 569db81400461479d865ab7370c5ddd4c060158e..8b7bbef356a2cef2768c604fc2e29c786eb477f7 100644 --- a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/ApplicationTests.java +++ b/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() { diff --git a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java similarity index 75% rename from spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java index f1afbccfba0fbf389e85bc94f361c8815af3713e..b08f07b7cd71d243c1b8fe671170f49b487c0195 100644 --- a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java +++ b/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 users = userMapper.getAll(); + List 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); diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java similarity index 75% rename from spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java index 7ad9e06a023e170bcc720fe2a919e8678f04fd6d..77ebc467504338c9d0cf378750e3040a57c896dc 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java +++ b/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 users = userMapper.getAll(); + List 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); diff --git a/spring-boot-mybatis-mulidatasource/users.sql b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql similarity index 100% rename from spring-boot-mybatis-mulidatasource/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql diff --git a/spring-boot-mybatis-mulidatasource/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml similarity index 73% rename from spring-boot-mybatis-mulidatasource/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml index 5d43e6a9fa41788efa5b51d069528e21974439ab..66f257af5f2930cfa9794e3a1708851dbe0c49d5 100644 --- a/spring-boot-mybatis-mulidatasource/pom.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml @@ -4,17 +4,17 @@ 4.0.0 com.neo - spring-boot-mybatis-mulidatasource + spring-boot-mybatis-xml-mulidatasource 1.0.0 jar - spring-boot-mybatis-mulidatasource + spring-boot-mybatis-xml-mulidatasource Demo project for Spring Boot and mybatis org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.1.0.RELEASE @@ -24,15 +24,6 @@ - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-web @@ -40,16 +31,16 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.1.1 + 2.0.0 mysql mysql-connector-java - - org.springframework.boot - spring-boot-devtools - true + + org.springframework.boot + spring-boot-starter-test + test @@ -58,12 +49,8 @@ org.springframework.boot spring-boot-maven-plugin - - true - - diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/Application.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java similarity index 62% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/Application.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java index 8b612caa18942ea740a2f1655ee60e5510fee372..ad7b9d9d7b7d28d4071ec2f875074d584cc01b5d 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/Application.java +++ b/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); } } diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java similarity index 96% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java index 3e3c8b4829f376cd3fae219fec99f9852c8acf90..40bcf28d51c18ee4c133fb5caf0ef1046a766b20 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java +++ b/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; diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java similarity index 96% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java index 3b80cce1015f1e4a2da7f497d93d556afa2a2f2f..67864089a3761d7eb37a109180c6f7c6b421059c 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java +++ b/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; diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java similarity index 100% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java new file mode 100644 index 0000000000000000000000000000000000000000..d9502822f5c57245e17b0f1566b37d325529c08e --- /dev/null +++ b/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 getAll(); + + User getOne(Long id); + + void insert(User user); + + void update(User user); + + void delete(Long id); + +} \ No newline at end of file diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java new file mode 100644 index 0000000000000000000000000000000000000000..d5c91ebf11542957ab667c659329677dcda15e4b --- /dev/null +++ b/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 getAll(); + + User getOne(Long id); + + void insert(User user); + + void update(User user); + + void delete(Long id); + +} \ No newline at end of file diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/entity/UserEntity.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java similarity index 86% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/entity/UserEntity.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java index 9bb3497599cb0b49ee21e0bacd68abb1c44eecff..de501655b46e0afe30fda644de09042b34fa6729 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/entity/UserEntity.java +++ b/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; diff --git a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/web/UserController.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/web/UserController.java similarity index 76% rename from spring-boot-mybatis-mulidatasource/src/main/java/com/neo/web/UserController.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/web/UserController.java index 198fa5c735aa10387d0e9bd847746c5a71f6e73b..a608500f10997c03878ef020c5a91b733a8b10e9 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/java/com/neo/web/UserController.java +++ b/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 getUsers() { - List users=user1Mapper.getAll(); + public List getUsers() { + List 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); } diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..e2e0f4a743b975c6991f42dfc8d3dacaa9cd98f6 --- /dev/null +++ b/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 diff --git a/spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml similarity index 88% rename from spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml index 4728e532770b5dcbf93e1be7264e74e515785b14..0a2ced2ce680057a5f711b6d69037cdbce8f6795 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ WHERE id = #{id} - + INSERT INTO users (userName,passWord,user_sex) @@ -34,7 +34,7 @@ (#{userName}, #{passWord}, #{userSex}) - + UPDATE users SET diff --git a/spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml similarity index 88% rename from spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml index b56eec500db76deb68fa94eec4486fa1b4968fb6..da3dc2e7ce6a61a7f80b45e78d243551af099333 100644 --- a/spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml @@ -1,7 +1,7 @@ - + @@ -26,7 +26,7 @@ WHERE id = #{id} - + INSERT INTO users (userName,passWord,user_sex) @@ -34,7 +34,7 @@ (#{userName}, #{passWord}, #{userSex}) - + UPDATE users SET diff --git a/spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mybatis-config.xml b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from spring-boot-mybatis-mulidatasource/src/main/resources/mybatis/mybatis-config.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mybatis-config.xml diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/ApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java similarity index 90% rename from spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java index 569db81400461479d865ab7370c5ddd4c060158e..422edba96e828a016900cc957f4a17b3047d62eb 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/ApplicationTests.java +++ b/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() { diff --git a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java similarity index 75% rename from spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java index f1afbccfba0fbf389e85bc94f361c8815af3713e..12c4b6aa8dc5a9d7edbef4dc6f363af00b6f8b90 100644 --- a/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java +++ b/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 users = userMapper.getAll(); + List 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); diff --git a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java similarity index 75% rename from spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java index 7ad9e06a023e170bcc720fe2a919e8678f04fd6d..77ebc467504338c9d0cf378750e3040a57c896dc 100644 --- a/spring-boot-mybatis-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java +++ b/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 users = userMapper.getAll(); + List 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); diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql new file mode 100644 index 0000000000000000000000000000000000000000..c8a2769d5953bac6c31eb06c340a2c1c99a41257 --- /dev/null +++ b/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; +