diff --git a/lab-12/lab-12-mybatis-annotation/pom.xml b/lab-12-mybatis/lab-12-mybatis-annotation/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/pom.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/pom.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-plus/pom.xml b/lab-12-mybatis/lab-12-mybatis-plus/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-plus/pom.xml rename to lab-12-mybatis/lab-12-mybatis-plus/pom.xml diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-tk/pom.xml b/lab-12-mybatis/lab-12-mybatis-tk/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/pom.xml rename to lab-12-mybatis/lab-12-mybatis-tk/pom.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-xml/pom.xml b/lab-12-mybatis/lab-12-mybatis-xml/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/pom.xml rename to lab-12-mybatis/lab-12-mybatis-xml/pom.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/pom.xml b/lab-12-mybatis/pom.xml similarity index 94% rename from lab-12/pom.xml rename to lab-12-mybatis/pom.xml index 382fb2ff..abc9330d 100644 --- a/lab-12/pom.xml +++ b/lab-12-mybatis/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-12 + lab-12-mybatis pom lab-12-mybatis-xml diff --git a/lab-12/《芋道 Spring Boot MyBatis 入门》.md b/lab-12-mybatis/《芋道 Spring Boot MyBatis 入门》.md similarity index 100% rename from lab-12/《芋道 Spring Boot MyBatis 入门》.md rename to lab-12-mybatis/《芋道 Spring Boot MyBatis 入门》.md diff --git a/pom.xml b/pom.xml index 39ea5dcf..306d6a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ - lab-11-spring-data-redis - + + lab-12-mybatis