diff --git a/spring-boot-mybatis-annotation/src/main/resources/application.properties b/spring-boot-mybatis-annotation/src/main/resources/application.properties deleted file mode 100644 index 3673963dcf68e23fe00e3e28f2eadb7f5cd424c1..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-annotation/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -mybatis.type-aliases-package=com.neo.entity - -spring.datasource.driverClassName = com.mysql.jdbc.Driver -spring.datasource.url = jdbc:mysql://localhost:3306/test1?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username = root -spring.datasource.password = root diff --git a/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java b/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java deleted file mode 100644 index c4f0354440ae4cfc7045c1d5c1a046461d55414c..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.neo.mapper; - -import java.util.List; - -import com.neo.entity.UserEntity; - -public interface UserMapper { - - 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-xml/src/main/resources/application.properties b/spring-boot-mybatis-xml/src/main/resources/application.properties deleted file mode 100644 index 72c49e690a0c864c4f859a6e6ef8310472e77f06..0000000000000000000000000000000000000000 --- a/spring-boot-mybatis-xml/src/main/resources/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -mybatis.config-locations=classpath:mybatis/mybatis-config.xml -mybatis.mapper-locations=classpath:mybatis/mapper/*.xml -mybatis.type-aliases-package=com.neo.entity - -spring.datasource.driverClassName = com.mysql.jdbc.Driver -spring.datasource.url = jdbc:mysql://localhost:3306/test1?useUnicode=true&characterEncoding=utf-8 -spring.datasource.username = root -spring.datasource.password = root diff --git a/spring-boot-mybatis-annotation/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml similarity index 56% rename from spring-boot-mybatis-annotation/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml index 708959c91f159e90970abf9f22ff853b60efc825..45ab8ec369604e0e31941181fdd14941d51975aa 100644 --- a/spring-boot-mybatis-annotation/pom.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.1.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,47 +31,24 @@ 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 - - - src/main/resources - true - - bootstrap-test.properties - bootstrap-dev.properties - bootstrap-pro.properties - bootstrap.properties - - - - src/main/resources - true - - bootstrap-${env}.properties - bootstrap.properties - - - org.springframework.boot spring-boot-maven-plugin - - true - diff --git a/spring-boot-mybatis-xml/src/main/java/com/neo/Application.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java similarity index 72% rename from spring-boot-mybatis-xml/src/main/java/com/neo/Application.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java index 8f280fe0e058b71ef023cc4fce025bb57b0fb2c0..ebac358adab5fe35377f1bd43d94d2fe04c73204 100644 --- a/spring-boot-mybatis-xml/src/main/java/com/neo/Application.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java @@ -6,9 +6,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @MapperScan("com.neo.mapper") -public class Application { +public class MybatisAnnotationApplication { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(MybatisAnnotationApplication.class, args); } } diff --git a/spring-boot-mybatis-annotation/src/main/java/com/neo/enums/UserSexEnum.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/enums/UserSexEnum.java similarity index 100% rename from spring-boot-mybatis-annotation/src/main/java/com/neo/enums/UserSexEnum.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/enums/UserSexEnum.java diff --git a/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java similarity index 87% rename from spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java index 1946fa1acef6c3629f0edf1de8b1f03295c377e1..0189ea95cf290730c0a33636497f454df3e1f6b4 100644 --- a/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java @@ -2,6 +2,7 @@ package com.neo.mapper; import java.util.List; +import com.neo.model.User; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Result; @@ -9,7 +10,6 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import com.neo.entity.UserEntity; import com.neo.enums.UserSexEnum; public interface UserMapper { @@ -19,20 +19,20 @@ public interface UserMapper { @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-xml/src/main/java/com/neo/entity/UserEntity.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java similarity index 86% rename from spring-boot-mybatis-xml/src/main/java/com/neo/entity/UserEntity.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java index 9bb3497599cb0b49ee21e0bacd68abb1c44eecff..de501655b46e0afe30fda644de09042b34fa6729 100644 --- a/spring-boot-mybatis-xml/src/main/java/com/neo/entity/UserEntity.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/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/src/main/java/com/neo/web/UserController.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java similarity index 74% rename from spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java index eef4478d5d48275d977732c6096f3b6975a81f15..25144b362674562617d8c62d68d5e6ab9bcf5717 100644 --- a/spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java @@ -7,7 +7,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.UserMapper; @RestController @@ -17,24 +17,24 @@ public class UserController { private UserMapper userMapper; @RequestMapping("/getUsers") - public List getUsers() { - List users=userMapper.getAll(); + public List getUsers() { + List users=userMapper.getAll(); return users; } @RequestMapping("/getUser") - public UserEntity getUser(Long id) { - UserEntity user=userMapper.getOne(id); + public User getUser(Long id) { + User user=userMapper.getOne(id); return user; } @RequestMapping("/add") - public void save(UserEntity user) { + public void save(User user) { userMapper.insert(user); } @RequestMapping(value="update") - public void update(UserEntity user) { + public void update(User user) { userMapper.update(user); } diff --git a/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/resources/application.properties b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..06400e91adb5eae17a4122f8e9afe56a5d4a6a2c --- /dev/null +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/resources/application.properties @@ -0,0 +1,6 @@ +mybatis.type-aliases-package=com.neo.model + +spring.datasource.url=jdbc:mysql://localhost:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true +spring.datasource.username=root +spring.datasource.password=root +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/spring-boot-mybatis-annotation/src/test/java/com/neo/ApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java similarity index 86% rename from spring-boot-mybatis-annotation/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java index 569db81400461479d865ab7370c5ddd4c060158e..9a97774820ddfa02be052ad0012ac007fe7b6bbc 100644 --- a/spring-boot-mybatis-annotation/src/test/java/com/neo/ApplicationTests.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class ApplicationTests { +public class MybatisAnnotationApplicationTests { @Test public void contextLoads() { diff --git a/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java similarity index 57% rename from spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java index 08ab926f0d1095c7870e80aaa73929af3e486b0e..0e12f6fd37ca71cc9762f6daf3d14c062ee32045 100644 --- a/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java +++ b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java @@ -2,6 +2,7 @@ package com.neo.mapper; import java.util.List; +import com.neo.model.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -9,7 +10,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) @@ -17,31 +17,31 @@ import com.neo.enums.UserSexEnum; public class UserMapperTest { @Autowired - private UserMapper UserMapper; + private UserMapper userMapper; @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("aa1", "a123456", UserSexEnum.MAN)); + userMapper.insert(new User("bb1", "b123456", UserSexEnum.WOMAN)); + userMapper.insert(new User("cc1", "b123456", UserSexEnum.WOMAN)); - Assert.assertEquals(3, UserMapper.getAll().size()); + Assert.assertEquals(3, userMapper.getAll().size()); } @Test public void testQuery() throws Exception { - List users = UserMapper.getAll(); + List users = userMapper.getAll(); System.out.println(users.toString()); } @Test public void testUpdate() throws Exception { - UserEntity user = UserMapper.getOne(3l); + User user = userMapper.getOne(30l); System.out.println(user.toString()); user.setNickName("neo"); - UserMapper.update(user); - Assert.assertTrue(("neo".equals(UserMapper.getOne(3l).getNickName()))); + userMapper.update(user); + Assert.assertTrue(("neo".equals(userMapper.getOne(30l).getNickName()))); } } \ No newline at end of file diff --git a/spring-boot-mybatis-annotation/users.sql b/spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql similarity index 100% rename from spring-boot-mybatis-annotation/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql diff --git a/spring-boot-mybatis-xml/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml similarity index 55% rename from spring-boot-mybatis-xml/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml index a89db0bcf1766f263594380fe6749f89c7d96b36..389ee8163866a48edf10a6b37baebb9e7bfdc8b7 100644 --- a/spring-boot-mybatis-xml/pom.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.9.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,50 +31,26 @@ 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 - - - src/main/resources - true - - bootstrap-test.properties - bootstrap-dev.properties - bootstrap-pro.properties - bootstrap.properties - - - - src/main/resources - true - - bootstrap-${env}.properties - bootstrap.properties - - - org.springframework.boot spring-boot-maven-plugin - - true - - diff --git a/spring-boot-mybatis-annotation/src/main/java/com/neo/Application.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java similarity index 74% rename from spring-boot-mybatis-annotation/src/main/java/com/neo/Application.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java index 8f280fe0e058b71ef023cc4fce025bb57b0fb2c0..863b95aba140259c9e27aaeefd10f22e508c2fb7 100644 --- a/spring-boot-mybatis-annotation/src/main/java/com/neo/Application.java +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java @@ -6,9 +6,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @MapperScan("com.neo.mapper") -public class Application { +public class MybatisXmlApplication { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringApplication.run(MybatisXmlApplication.class, args); } } diff --git a/spring-boot-mybatis-xml/src/main/java/com/neo/enums/UserSexEnum.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/enums/UserSexEnum.java similarity index 100% rename from spring-boot-mybatis-xml/src/main/java/com/neo/enums/UserSexEnum.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/enums/UserSexEnum.java diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..f08f70bf38f790941aee7653f609ba550b3b2a7e --- /dev/null +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package com.neo.mapper; + +import java.util.List; + +import com.neo.model.User; + +public interface UserMapper { + + 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-annotation/src/main/java/com/neo/entity/UserEntity.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java similarity index 86% rename from spring-boot-mybatis-annotation/src/main/java/com/neo/entity/UserEntity.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java index 9bb3497599cb0b49ee21e0bacd68abb1c44eecff..de501655b46e0afe30fda644de09042b34fa6729 100644 --- a/spring-boot-mybatis-annotation/src/main/java/com/neo/entity/UserEntity.java +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/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-xml/src/main/java/com/neo/web/UserController.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java similarity index 74% rename from spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java index eef4478d5d48275d977732c6096f3b6975a81f15..25144b362674562617d8c62d68d5e6ab9bcf5717 100644 --- a/spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java @@ -7,7 +7,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.UserMapper; @RestController @@ -17,24 +17,24 @@ public class UserController { private UserMapper userMapper; @RequestMapping("/getUsers") - public List getUsers() { - List users=userMapper.getAll(); + public List getUsers() { + List users=userMapper.getAll(); return users; } @RequestMapping("/getUser") - public UserEntity getUser(Long id) { - UserEntity user=userMapper.getOne(id); + public User getUser(Long id) { + User user=userMapper.getOne(id); return user; } @RequestMapping("/add") - public void save(UserEntity user) { + public void save(User user) { userMapper.insert(user); } @RequestMapping(value="update") - public void update(UserEntity user) { + public void update(User user) { userMapper.update(user); } diff --git a/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/application.properties b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..0e2bea577ce44242d64472d0d811883f15764ea7 --- /dev/null +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/application.properties @@ -0,0 +1,8 @@ +mybatis.config-location=classpath:mybatis/mybatis-config.xml +mybatis.mapper-locations=classpath:mybatis/mapper/*.xml +mybatis.type-aliases-package=com.neo.model + +spring.datasource.url=jdbc:mysql://localhost:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true +spring.datasource.username=root +spring.datasource.password=root +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml similarity index 88% rename from spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml index 7e0459d09c5745b2a686f12fb444c1153dac2eae..b84731b11f0a3d1de8d6d672e99fdc36da9aff63 100644 --- a/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/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-xml/src/main/resources/mybatis/mybatis-config.xml b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from spring-boot-mybatis-xml/src/main/resources/mybatis/mybatis-config.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/mybatis/mybatis-config.xml diff --git a/spring-boot-mybatis-xml/src/test/java/com/neo/ApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java similarity index 88% rename from spring-boot-mybatis-xml/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java index 569db81400461479d865ab7370c5ddd4c060158e..3938dfde3ed4b814bd17582432b7d3f9bf495f2c 100644 --- a/spring-boot-mybatis-xml/src/test/java/com/neo/ApplicationTests.java +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class ApplicationTests { +public class MybatisXmlApplicationTests { @Test public void contextLoads() { diff --git a/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java similarity index 60% rename from spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java index 4078e600d3d966f4c13512047aa35cdcefe7b6c5..586ff57af9f283bd51a5886d450c40376bab0f5d 100644 --- a/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java +++ b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java @@ -9,7 +9,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) @@ -17,20 +17,20 @@ import com.neo.enums.UserSexEnum; public class UserMapperTest { @Autowired - private UserMapper UserMapper; + private UserMapper userMapper; @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()); + 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,11 +41,11 @@ public class UserMapperTest { @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); - Assert.assertTrue(("neo".equals(UserMapper.getOne(6l).getNickName()))); + userMapper.update(user); + Assert.assertTrue(("neo".equals(userMapper.getOne(6l).getNickName()))); } } \ No newline at end of file diff --git a/spring-boot-mybatis-xml/src/test/java/com/neo/web/UserControllerTest.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/web/UserControllerTest.java similarity index 100% rename from spring-boot-mybatis-xml/src/test/java/com/neo/web/UserControllerTest.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/web/UserControllerTest.java diff --git a/spring-boot-mybatis-xml/users.sql b/spring-boot-mybatis/spring-boot-mybatis-xml/users.sql similarity index 100% rename from spring-boot-mybatis-xml/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-xml/users.sql