From 1711d928f4c3b351dd53cf2191698378ad50479b Mon Sep 17 00:00:00 2001 From: ityouknow Date: Sat, 24 Dec 2022 18:44:53 +0800 Subject: [PATCH] spring boot 3.0 --- .../pom.xml | 0 .../main/java/com/neo/banner/BannerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/banner.gif | Bin .../src/main/resources/banner.txt | 0 .../spring-boot-hello => spring-boot-hello}/pom.xml | 0 .../src/main/java/com/neo/HelloApplication.java | 0 .../java/com/neo/controller/HelloController.java | 0 .../src/main/resources/application.properties | 0 .../test/java/com/neo/HelloApplicationTests.java | 0 .../pom.xml | 0 .../src/main/java/com/neo/Application.java | 0 .../com/neo/controller/HelloWorldController.java | 0 .../src/main/resources/application.properties | 0 .../src/test/java/com/neo/ApplicationTests.java | 0 .../test/java/com/neo/controller/HelloTests.java | 0 .../spring-boot-jpa/pom.xml | 0 .../src/main/java/com/neo/JpaApplication.java | 0 .../src/main/java/com/neo/model/Address.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/model/UserDetail.java | 0 .../src/main/java/com/neo/model/UserInfo.java | 0 .../main/java/com/neo/param/UserDetailParam.java | 0 .../java/com/neo/repository/AddressRepository.java | 0 .../com/neo/repository/UserDetailRepository.java | 0 .../java/com/neo/repository/UserRepository.java | 0 .../java/com/neo/service/UserDetailService.java | 0 .../java/com/neo/service/UserDetailServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../src/test/java/com/neo/JpaApplicationTests.java | 0 .../com/neo/repository/JpaSpecificationTests.java | 0 .../neo/repository/UserDetailRepositoryTests.java | 0 .../com/neo/repository/UserRepositoryTests.java | 0 .../spring-boot-multi-Jpa/pom.xml | 0 .../src/main/java/com/neo/MultiJpaApplication.java | 0 .../main/java/com/neo/config/DataSourceConfig.java | 0 .../src/main/java/com/neo/config/PrimaryConfig.java | 0 .../main/java/com/neo/config/SecondaryConfig.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../neo/repository/test1/UserTest1Repository.java | 0 .../neo/repository/test2/UserTest2Repository.java | 0 .../src/main/resources/application.properties | 0 .../test/java/com/neo/MultiJpaApplicationTests.java | 0 .../com/neo/repository/UserRepositoryTests.java | 0 .../pom.xml | 0 .../src/main/java/com/neo/MAMApplication.java | 0 .../java/com/neo/datasource/DataSource1Config.java | 0 .../java/com/neo/datasource/DataSource2Config.java | 0 .../src/main/java/com/neo/enums/UserSexEnum.java | 0 .../main/java/com/neo/mapper/test1/User1Mapper.java | 0 .../main/java/com/neo/mapper/test2/User2Mapper.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../src/test/java/com/neo/MAMApplicationTests.java | 0 .../test/java/com/neo/mapper/User1MapperTest.java | 0 .../test/java/com/neo/mapper/User2MapperTest.java | 0 .../users.sql | 0 .../spring-boot-mybatis-annotation/pom.xml | 0 .../java/com/neo/MybatisAnnotationApplication.java | 0 .../src/main/java/com/neo/enums/UserSexEnum.java | 0 .../src/main/java/com/neo/mapper/UserMapper.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../com/neo/MybatisAnnotationApplicationTests.java | 0 .../test/java/com/neo/mapper/UserMapperTest.java | 0 .../spring-boot-mybatis-annotation/users.sql | 0 .../spring-boot-mybatis-xml-mulidatasource/pom.xml | 0 .../src/main/java/com/neo/MXMApplication.java | 0 .../java/com/neo/datasource/DataSource1Config.java | 0 .../java/com/neo/datasource/DataSource2Config.java | 0 .../src/main/java/com/neo/enums/UserSexEnum.java | 0 .../main/java/com/neo/mapper/test1/User1Mapper.java | 0 .../main/java/com/neo/mapper/test2/User2Mapper.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../resources/mybatis/mapper/test1/UserMapper.xml | 0 .../resources/mybatis/mapper/test2/UserMapper.xml | 0 .../src/main/resources/mybatis/mybatis-config.xml | 0 .../src/test/java/com/neo/MXMApplicationTests.java | 0 .../test/java/com/neo/mapper/User1MapperTest.java | 0 .../test/java/com/neo/mapper/User2MapperTest.java | 0 .../users.sql | 0 .../spring-boot-mybatis-xml/pom.xml | 0 .../main/java/com/neo/MybatisXmlApplication.java | 0 .../src/main/java/com/neo/enums/UserSexEnum.java | 0 .../src/main/java/com/neo/mapper/UserMapper.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../main/resources/mybatis/mapper/UserMapper.xml | 0 .../src/main/resources/mybatis/mybatis-config.xml | 0 .../java/com/neo/MybatisXmlApplicationTests.java | 0 .../test/java/com/neo/mapper/UserMapperTest.java | 0 .../test/java/com/neo/web/UserControllerTest.java | 0 .../spring-boot-mybatis-xml/users.sql | 0 .../spring-boot-redis => spring-boot-redis}/pom.xml | 0 .../src/main/java/com/neo/RedisApplication.java | 0 .../src/main/java/com/neo/config/RedisConfig.java | 0 .../src/main/java/com/neo/config/SessionConfig.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../test/java/com/neo/RedisApplicationTests.java | 0 .../src/test/java/com/neo/TestRedis.java | 0 .../spring-boot-thymeleaf-layout/pom.xml | 0 .../src/main/java/com/neo/TLayoutApplication.java | 0 .../src/main/java/com/neo/web/IndexController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/templates/base.html | 0 .../src/main/resources/templates/fragment.html | 0 .../src/main/resources/templates/home.html | 0 .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../main/resources/templates/layout/copyright.html | 0 .../src/main/resources/templates/layout/footer.html | 0 .../src/main/resources/templates/layout/header.html | 0 .../src/main/resources/templates/layout/left.html | 0 .../test/java/com/neo/TLayoutApplicationTests.java | 0 .../spring-boot-thymeleaf/pom.xml | 0 .../src/main/java/com/neo/ThymeleafApplication.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../main/java/com/neo/web/ExampleController.java | 0 .../src/main/java/com/neo/web/HelloController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/templates/eq.html | 0 .../src/main/resources/templates/hello.html | 0 .../src/main/resources/templates/if.html | 0 .../src/main/resources/templates/list.html | 0 .../src/main/resources/templates/string.html | 0 .../src/main/resources/templates/switch.html | 0 .../src/main/resources/templates/url.html | 0 .../java/com/neo/ThymeleafApplicationTests.java | 0 {3.x/spring-boot-web => spring-boot-web}/pom.xml | 0 .../src/main/java/com/neo/WebApplication.java | 0 .../src/main/java/com/neo/WebConfiguration.java | 0 .../src/main/java/com/neo/model/User.java | 0 .../java/com/neo/repository/UserRepository.java | 0 .../src/main/java/com/neo/util/NeoProperties.java | 0 .../src/main/java/com/neo/web/HelloController.java | 0 .../main/java/com/neo/web/ThymeleafController.java | 0 .../src/main/java/com/neo/web/UserController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/static/css/starter.css | 0 .../src/main/resources/static/images/favicon.png | Bin .../src/main/resources/templates/hello.html | 0 .../src/main/resources/templates/layout.html | 0 .../src/test/java/com/neo/WebApplicationTests.java | 0 .../java/com/neo/model/UserRepositoryTests.java | 0 .../src/test/java/com/neo/web/ProPertiesTest.java | 0 152 files changed, 0 insertions(+), 0 deletions(-) rename {3.x/spring-boot-banner => spring-boot-banner}/pom.xml (100%) rename {3.x/spring-boot-banner => spring-boot-banner}/src/main/java/com/neo/banner/BannerApplication.java (100%) rename {3.x/spring-boot-banner => spring-boot-banner}/src/main/resources/application.properties (100%) rename {3.x/spring-boot-banner => spring-boot-banner}/src/main/resources/banner.gif (100%) rename {3.x/spring-boot-banner => spring-boot-banner}/src/main/resources/banner.txt (100%) rename {3.x/spring-boot-hello => spring-boot-hello}/pom.xml (100%) rename {3.x/spring-boot-hello => spring-boot-hello}/src/main/java/com/neo/HelloApplication.java (100%) rename {3.x/spring-boot-hello => spring-boot-hello}/src/main/java/com/neo/controller/HelloController.java (100%) rename {3.x/spring-boot-hello => spring-boot-hello}/src/main/resources/application.properties (100%) rename {3.x/spring-boot-hello => spring-boot-hello}/src/test/java/com/neo/HelloApplicationTests.java (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/pom.xml (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/src/main/java/com/neo/Application.java (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/src/main/java/com/neo/controller/HelloWorldController.java (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/src/main/resources/application.properties (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/src/test/java/com/neo/ApplicationTests.java (100%) rename {3.x/spring-boot-helloWorld => spring-boot-helloWorld}/src/test/java/com/neo/controller/HelloTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/pom.xml (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/JpaApplication.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/model/Address.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/model/UserDetail.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/model/UserInfo.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/param/UserDetailParam.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/repository/AddressRepository.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/repository/UserDetailRepository.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/repository/UserRepository.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/service/UserDetailService.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/java/com/neo/service/UserDetailServiceImpl.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/main/resources/application.properties (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/test/java/com/neo/JpaApplicationTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/test/java/com/neo/repository/JpaSpecificationTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/test/java/com/neo/repository/UserDetailRepositoryTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-jpa/src/test/java/com/neo/repository/UserRepositoryTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/pom.xml (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/MultiJpaApplication.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/config/DataSourceConfig.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/config/PrimaryConfig.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/config/SecondaryConfig.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test1/UserTest1Repository.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test2/UserTest2Repository.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/main/resources/application.properties (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/test/java/com/neo/MultiJpaApplicationTests.java (100%) rename {3.x/spring-boot-jpa => spring-boot-jpa}/spring-boot-multi-Jpa/src/test/java/com/neo/repository/UserRepositoryTests.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/pom.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation-mulidatasource/users.sql (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/pom.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/java/com/neo/enums/UserSexEnum.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/java/com/neo/mapper/UserMapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/main/resources/application.properties (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/src/test/java/com/neo/mapper/UserMapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-annotation/users.sql (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/pom.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource1Config.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/datasource/DataSource2Config.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/enums/UserSexEnum.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test1/UserMapper.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mapper/test2/UserMapper.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/main/resources/mybatis/mybatis-config.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User1MapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/mapper/User2MapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml-mulidatasource/users.sql (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/pom.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/java/com/neo/enums/UserSexEnum.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/resources/application.properties (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/resources/mybatis/mapper/UserMapper.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/main/resources/mybatis/mybatis-config.xml (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/test/java/com/neo/mapper/UserMapperTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/src/test/java/com/neo/web/UserControllerTest.java (100%) rename {3.x/spring-boot-mybatis => spring-boot-mybatis}/spring-boot-mybatis-xml/users.sql (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/pom.xml (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/java/com/neo/RedisApplication.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/java/com/neo/config/RedisConfig.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/java/com/neo/config/SessionConfig.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/main/resources/application.properties (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/test/java/com/neo/RedisApplicationTests.java (100%) rename {3.x/spring-boot-redis => spring-boot-redis}/src/test/java/com/neo/TestRedis.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/pom.xml (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/java/com/neo/TLayoutApplication.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/java/com/neo/web/IndexController.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/application.properties (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/base.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/fragment.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/home.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/index.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/layout.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/copyright.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/footer.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/header.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/left.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf-layout/src/test/java/com/neo/TLayoutApplicationTests.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/pom.xml (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/java/com/neo/ThymeleafApplication.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/java/com/neo/web/ExampleController.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/java/com/neo/web/HelloController.java (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/application.properties (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/eq.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/hello.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/if.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/list.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/string.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/switch.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/main/resources/templates/url.html (100%) rename {3.x/spring-boot-thymeleaf => spring-boot-thymeleaf}/spring-boot-thymeleaf/src/test/java/com/neo/ThymeleafApplicationTests.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/pom.xml (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/WebApplication.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/WebConfiguration.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/model/User.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/repository/UserRepository.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/util/NeoProperties.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/web/HelloController.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/web/ThymeleafController.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/java/com/neo/web/UserController.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/resources/application.properties (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/resources/static/css/starter.css (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/resources/static/images/favicon.png (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/resources/templates/hello.html (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/main/resources/templates/layout.html (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/test/java/com/neo/WebApplicationTests.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/test/java/com/neo/model/UserRepositoryTests.java (100%) rename {3.x/spring-boot-web => spring-boot-web}/src/test/java/com/neo/web/ProPertiesTest.java (100%) diff --git a/3.x/spring-boot-banner/pom.xml b/spring-boot-banner/pom.xml similarity index 100% rename from 3.x/spring-boot-banner/pom.xml rename to spring-boot-banner/pom.xml diff --git a/3.x/spring-boot-banner/src/main/java/com/neo/banner/BannerApplication.java b/spring-boot-banner/src/main/java/com/neo/banner/BannerApplication.java similarity index 100% rename from 3.x/spring-boot-banner/src/main/java/com/neo/banner/BannerApplication.java rename to spring-boot-banner/src/main/java/com/neo/banner/BannerApplication.java diff --git a/3.x/spring-boot-banner/src/main/resources/application.properties b/spring-boot-banner/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-banner/src/main/resources/application.properties rename to spring-boot-banner/src/main/resources/application.properties diff --git a/3.x/spring-boot-banner/src/main/resources/banner.gif b/spring-boot-banner/src/main/resources/banner.gif similarity index 100% rename from 3.x/spring-boot-banner/src/main/resources/banner.gif rename to spring-boot-banner/src/main/resources/banner.gif diff --git a/3.x/spring-boot-banner/src/main/resources/banner.txt b/spring-boot-banner/src/main/resources/banner.txt similarity index 100% rename from 3.x/spring-boot-banner/src/main/resources/banner.txt rename to spring-boot-banner/src/main/resources/banner.txt diff --git a/3.x/spring-boot-hello/pom.xml b/spring-boot-hello/pom.xml similarity index 100% rename from 3.x/spring-boot-hello/pom.xml rename to spring-boot-hello/pom.xml diff --git a/3.x/spring-boot-hello/src/main/java/com/neo/HelloApplication.java b/spring-boot-hello/src/main/java/com/neo/HelloApplication.java similarity index 100% rename from 3.x/spring-boot-hello/src/main/java/com/neo/HelloApplication.java rename to spring-boot-hello/src/main/java/com/neo/HelloApplication.java diff --git a/3.x/spring-boot-hello/src/main/java/com/neo/controller/HelloController.java b/spring-boot-hello/src/main/java/com/neo/controller/HelloController.java similarity index 100% rename from 3.x/spring-boot-hello/src/main/java/com/neo/controller/HelloController.java rename to spring-boot-hello/src/main/java/com/neo/controller/HelloController.java diff --git a/3.x/spring-boot-hello/src/main/resources/application.properties b/spring-boot-hello/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-hello/src/main/resources/application.properties rename to spring-boot-hello/src/main/resources/application.properties diff --git a/3.x/spring-boot-hello/src/test/java/com/neo/HelloApplicationTests.java b/spring-boot-hello/src/test/java/com/neo/HelloApplicationTests.java similarity index 100% rename from 3.x/spring-boot-hello/src/test/java/com/neo/HelloApplicationTests.java rename to spring-boot-hello/src/test/java/com/neo/HelloApplicationTests.java diff --git a/3.x/spring-boot-helloWorld/pom.xml b/spring-boot-helloWorld/pom.xml similarity index 100% rename from 3.x/spring-boot-helloWorld/pom.xml rename to spring-boot-helloWorld/pom.xml diff --git a/3.x/spring-boot-helloWorld/src/main/java/com/neo/Application.java b/spring-boot-helloWorld/src/main/java/com/neo/Application.java similarity index 100% rename from 3.x/spring-boot-helloWorld/src/main/java/com/neo/Application.java rename to spring-boot-helloWorld/src/main/java/com/neo/Application.java diff --git a/3.x/spring-boot-helloWorld/src/main/java/com/neo/controller/HelloWorldController.java b/spring-boot-helloWorld/src/main/java/com/neo/controller/HelloWorldController.java similarity index 100% rename from 3.x/spring-boot-helloWorld/src/main/java/com/neo/controller/HelloWorldController.java rename to spring-boot-helloWorld/src/main/java/com/neo/controller/HelloWorldController.java diff --git a/3.x/spring-boot-helloWorld/src/main/resources/application.properties b/spring-boot-helloWorld/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-helloWorld/src/main/resources/application.properties rename to spring-boot-helloWorld/src/main/resources/application.properties diff --git a/3.x/spring-boot-helloWorld/src/test/java/com/neo/ApplicationTests.java b/spring-boot-helloWorld/src/test/java/com/neo/ApplicationTests.java similarity index 100% rename from 3.x/spring-boot-helloWorld/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-helloWorld/src/test/java/com/neo/ApplicationTests.java diff --git a/3.x/spring-boot-helloWorld/src/test/java/com/neo/controller/HelloTests.java b/spring-boot-helloWorld/src/test/java/com/neo/controller/HelloTests.java similarity index 100% rename from 3.x/spring-boot-helloWorld/src/test/java/com/neo/controller/HelloTests.java rename to spring-boot-helloWorld/src/test/java/com/neo/controller/HelloTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/pom.xml b/spring-boot-jpa/spring-boot-jpa/pom.xml similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/pom.xml rename to spring-boot-jpa/spring-boot-jpa/pom.xml diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/JpaApplication.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/JpaApplication.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/JpaApplication.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/JpaApplication.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/Address.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/Address.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/Address.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/Address.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/User.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/User.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserDetail.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserDetail.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserDetail.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserDetail.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserInfo.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserInfo.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserInfo.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/model/UserInfo.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/param/UserDetailParam.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/param/UserDetailParam.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/param/UserDetailParam.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/param/UserDetailParam.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/AddressRepository.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/AddressRepository.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/AddressRepository.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/AddressRepository.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserDetailRepository.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserDetailRepository.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserDetailRepository.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserDetailRepository.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserRepository.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserRepository.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserRepository.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/repository/UserRepository.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailService.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailService.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailService.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailService.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailServiceImpl.java b/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailServiceImpl.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailServiceImpl.java rename to spring-boot-jpa/spring-boot-jpa/src/main/java/com/neo/service/UserDetailServiceImpl.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/main/resources/application.properties b/spring-boot-jpa/spring-boot-jpa/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/main/resources/application.properties rename to spring-boot-jpa/spring-boot-jpa/src/main/resources/application.properties diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/JpaApplicationTests.java b/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/JpaApplicationTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/JpaApplicationTests.java rename to spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/JpaApplicationTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/JpaSpecificationTests.java b/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/JpaSpecificationTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/JpaSpecificationTests.java rename to spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/JpaSpecificationTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserDetailRepositoryTests.java b/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserDetailRepositoryTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserDetailRepositoryTests.java rename to spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserDetailRepositoryTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserRepositoryTests.java b/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserRepositoryTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserRepositoryTests.java rename to spring-boot-jpa/spring-boot-jpa/src/test/java/com/neo/repository/UserRepositoryTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/pom.xml b/spring-boot-jpa/spring-boot-multi-Jpa/pom.xml similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/pom.xml rename to spring-boot-jpa/spring-boot-multi-Jpa/pom.xml diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/MultiJpaApplication.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/MultiJpaApplication.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/MultiJpaApplication.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/MultiJpaApplication.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/DataSourceConfig.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/DataSourceConfig.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/DataSourceConfig.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/DataSourceConfig.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/PrimaryConfig.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/PrimaryConfig.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/PrimaryConfig.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/PrimaryConfig.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/SecondaryConfig.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/SecondaryConfig.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/SecondaryConfig.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/config/SecondaryConfig.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/model/User.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/model/User.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test1/UserTest1Repository.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test1/UserTest1Repository.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test1/UserTest1Repository.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test1/UserTest1Repository.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test2/UserTest2Repository.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test2/UserTest2Repository.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test2/UserTest2Repository.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/java/com/neo/repository/test2/UserTest2Repository.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/resources/application.properties b/spring-boot-jpa/spring-boot-multi-Jpa/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/main/resources/application.properties rename to spring-boot-jpa/spring-boot-multi-Jpa/src/main/resources/application.properties diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/MultiJpaApplicationTests.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/MultiJpaApplicationTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/MultiJpaApplicationTests.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/MultiJpaApplicationTests.java diff --git a/3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/repository/UserRepositoryTests.java b/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/repository/UserRepositoryTests.java similarity index 100% rename from 3.x/spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/repository/UserRepositoryTests.java rename to spring-boot-jpa/spring-boot-multi-Jpa/src/test/java/com/neo/repository/UserRepositoryTests.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/pom.xml diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/MAMApplication.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/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 3.x/spring-boot-mybatis/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/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/main/resources/application.properties diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/src/test/java/com/neo/MAMApplicationTests.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-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 diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql b/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-annotation-mulidatasource/users.sql diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-annotation/pom.xml diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/MybatisAnnotationApplication.java diff --git a/3.x/spring-boot-mybatis/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 3.x/spring-boot-mybatis/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/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/resources/application.properties rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/main/resources/application.properties diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-annotation/src/test/java/com/neo/MybatisAnnotationApplicationTests.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql b/spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-annotation/users.sql diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/pom.xml diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/MXMApplication.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test1/User1Mapper.java diff --git a/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/mapper/test2/User2Mapper.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/main/resources/application.properties diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/src/test/java/com/neo/MXMApplicationTests.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-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 diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql b/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-xml-mulidatasource/users.sql diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml b/spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml rename to spring-boot-mybatis/spring-boot-mybatis-xml/pom.xml diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/MybatisXmlApplication.java diff --git a/3.x/spring-boot-mybatis/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 3.x/spring-boot-mybatis/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/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/mapper/UserMapper.java diff --git a/3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/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 similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/application.properties rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/main/resources/application.properties diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/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 3.x/spring-boot-mybatis/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/3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java b/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java rename to spring-boot-mybatis/spring-boot-mybatis-xml/src/test/java/com/neo/MybatisXmlApplicationTests.java diff --git a/3.x/spring-boot-mybatis/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 100% rename from 3.x/spring-boot-mybatis/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 diff --git a/3.x/spring-boot-mybatis/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 3.x/spring-boot-mybatis/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/3.x/spring-boot-mybatis/spring-boot-mybatis-xml/users.sql b/spring-boot-mybatis/spring-boot-mybatis-xml/users.sql similarity index 100% rename from 3.x/spring-boot-mybatis/spring-boot-mybatis-xml/users.sql rename to spring-boot-mybatis/spring-boot-mybatis-xml/users.sql diff --git a/3.x/spring-boot-redis/pom.xml b/spring-boot-redis/pom.xml similarity index 100% rename from 3.x/spring-boot-redis/pom.xml rename to spring-boot-redis/pom.xml diff --git a/3.x/spring-boot-redis/src/main/java/com/neo/RedisApplication.java b/spring-boot-redis/src/main/java/com/neo/RedisApplication.java similarity index 100% rename from 3.x/spring-boot-redis/src/main/java/com/neo/RedisApplication.java rename to spring-boot-redis/src/main/java/com/neo/RedisApplication.java diff --git a/3.x/spring-boot-redis/src/main/java/com/neo/config/RedisConfig.java b/spring-boot-redis/src/main/java/com/neo/config/RedisConfig.java similarity index 100% rename from 3.x/spring-boot-redis/src/main/java/com/neo/config/RedisConfig.java rename to spring-boot-redis/src/main/java/com/neo/config/RedisConfig.java diff --git a/3.x/spring-boot-redis/src/main/java/com/neo/config/SessionConfig.java b/spring-boot-redis/src/main/java/com/neo/config/SessionConfig.java similarity index 100% rename from 3.x/spring-boot-redis/src/main/java/com/neo/config/SessionConfig.java rename to spring-boot-redis/src/main/java/com/neo/config/SessionConfig.java diff --git a/3.x/spring-boot-redis/src/main/java/com/neo/model/User.java b/spring-boot-redis/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-redis/src/main/java/com/neo/model/User.java rename to spring-boot-redis/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-redis/src/main/java/com/neo/web/UserController.java b/spring-boot-redis/src/main/java/com/neo/web/UserController.java similarity index 100% rename from 3.x/spring-boot-redis/src/main/java/com/neo/web/UserController.java rename to spring-boot-redis/src/main/java/com/neo/web/UserController.java diff --git a/3.x/spring-boot-redis/src/main/resources/application.properties b/spring-boot-redis/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-redis/src/main/resources/application.properties rename to spring-boot-redis/src/main/resources/application.properties diff --git a/3.x/spring-boot-redis/src/test/java/com/neo/RedisApplicationTests.java b/spring-boot-redis/src/test/java/com/neo/RedisApplicationTests.java similarity index 100% rename from 3.x/spring-boot-redis/src/test/java/com/neo/RedisApplicationTests.java rename to spring-boot-redis/src/test/java/com/neo/RedisApplicationTests.java diff --git a/3.x/spring-boot-redis/src/test/java/com/neo/TestRedis.java b/spring-boot-redis/src/test/java/com/neo/TestRedis.java similarity index 100% rename from 3.x/spring-boot-redis/src/test/java/com/neo/TestRedis.java rename to spring-boot-redis/src/test/java/com/neo/TestRedis.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/TLayoutApplication.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/TLayoutApplication.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/TLayoutApplication.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/TLayoutApplication.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/web/IndexController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/web/IndexController.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/web/IndexController.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/com/neo/web/IndexController.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/application.properties b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/application.properties rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/application.properties diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/base.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/base.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/base.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/base.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/fragment.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/fragment.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/fragment.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/fragment.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/home.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/home.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/home.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/home.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/index.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/index.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/index.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/index.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/copyright.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/copyright.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/copyright.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/copyright.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/footer.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/footer.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/footer.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/footer.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/header.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/header.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/header.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/header.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/left.html b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/left.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/left.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/resources/templates/layout/left.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/com/neo/TLayoutApplicationTests.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/com/neo/TLayoutApplicationTests.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/com/neo/TLayoutApplicationTests.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/com/neo/TLayoutApplicationTests.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/pom.xml b/spring-boot-thymeleaf/spring-boot-thymeleaf/pom.xml similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/pom.xml rename to spring-boot-thymeleaf/spring-boot-thymeleaf/pom.xml diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/ThymeleafApplication.java b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/ThymeleafApplication.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/ThymeleafApplication.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/ThymeleafApplication.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/model/User.java b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/model/User.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/ExampleController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/ExampleController.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/ExampleController.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/ExampleController.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/HelloController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/HelloController.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/HelloController.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/java/com/neo/web/HelloController.java diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/application.properties b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/application.properties rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/application.properties diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/eq.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/eq.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/eq.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/eq.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/hello.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/hello.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/hello.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/hello.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/if.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/if.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/if.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/if.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/list.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/list.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/list.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/list.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/string.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/string.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/string.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/string.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/switch.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/switch.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/switch.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/switch.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/url.html b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/url.html similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/url.html rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/main/resources/templates/url.html diff --git a/3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/test/java/com/neo/ThymeleafApplicationTests.java b/spring-boot-thymeleaf/spring-boot-thymeleaf/src/test/java/com/neo/ThymeleafApplicationTests.java similarity index 100% rename from 3.x/spring-boot-thymeleaf/spring-boot-thymeleaf/src/test/java/com/neo/ThymeleafApplicationTests.java rename to spring-boot-thymeleaf/spring-boot-thymeleaf/src/test/java/com/neo/ThymeleafApplicationTests.java diff --git a/3.x/spring-boot-web/pom.xml b/spring-boot-web/pom.xml similarity index 100% rename from 3.x/spring-boot-web/pom.xml rename to spring-boot-web/pom.xml diff --git a/3.x/spring-boot-web/src/main/java/com/neo/WebApplication.java b/spring-boot-web/src/main/java/com/neo/WebApplication.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/WebApplication.java rename to spring-boot-web/src/main/java/com/neo/WebApplication.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/WebConfiguration.java b/spring-boot-web/src/main/java/com/neo/WebConfiguration.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/WebConfiguration.java rename to spring-boot-web/src/main/java/com/neo/WebConfiguration.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/model/User.java b/spring-boot-web/src/main/java/com/neo/model/User.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/model/User.java rename to spring-boot-web/src/main/java/com/neo/model/User.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/repository/UserRepository.java b/spring-boot-web/src/main/java/com/neo/repository/UserRepository.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/repository/UserRepository.java rename to spring-boot-web/src/main/java/com/neo/repository/UserRepository.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/util/NeoProperties.java b/spring-boot-web/src/main/java/com/neo/util/NeoProperties.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/util/NeoProperties.java rename to spring-boot-web/src/main/java/com/neo/util/NeoProperties.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/web/HelloController.java b/spring-boot-web/src/main/java/com/neo/web/HelloController.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/web/HelloController.java rename to spring-boot-web/src/main/java/com/neo/web/HelloController.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/web/ThymeleafController.java b/spring-boot-web/src/main/java/com/neo/web/ThymeleafController.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/web/ThymeleafController.java rename to spring-boot-web/src/main/java/com/neo/web/ThymeleafController.java diff --git a/3.x/spring-boot-web/src/main/java/com/neo/web/UserController.java b/spring-boot-web/src/main/java/com/neo/web/UserController.java similarity index 100% rename from 3.x/spring-boot-web/src/main/java/com/neo/web/UserController.java rename to spring-boot-web/src/main/java/com/neo/web/UserController.java diff --git a/3.x/spring-boot-web/src/main/resources/application.properties b/spring-boot-web/src/main/resources/application.properties similarity index 100% rename from 3.x/spring-boot-web/src/main/resources/application.properties rename to spring-boot-web/src/main/resources/application.properties diff --git a/3.x/spring-boot-web/src/main/resources/static/css/starter.css b/spring-boot-web/src/main/resources/static/css/starter.css similarity index 100% rename from 3.x/spring-boot-web/src/main/resources/static/css/starter.css rename to spring-boot-web/src/main/resources/static/css/starter.css diff --git a/3.x/spring-boot-web/src/main/resources/static/images/favicon.png b/spring-boot-web/src/main/resources/static/images/favicon.png similarity index 100% rename from 3.x/spring-boot-web/src/main/resources/static/images/favicon.png rename to spring-boot-web/src/main/resources/static/images/favicon.png diff --git a/3.x/spring-boot-web/src/main/resources/templates/hello.html b/spring-boot-web/src/main/resources/templates/hello.html similarity index 100% rename from 3.x/spring-boot-web/src/main/resources/templates/hello.html rename to spring-boot-web/src/main/resources/templates/hello.html diff --git a/3.x/spring-boot-web/src/main/resources/templates/layout.html b/spring-boot-web/src/main/resources/templates/layout.html similarity index 100% rename from 3.x/spring-boot-web/src/main/resources/templates/layout.html rename to spring-boot-web/src/main/resources/templates/layout.html diff --git a/3.x/spring-boot-web/src/test/java/com/neo/WebApplicationTests.java b/spring-boot-web/src/test/java/com/neo/WebApplicationTests.java similarity index 100% rename from 3.x/spring-boot-web/src/test/java/com/neo/WebApplicationTests.java rename to spring-boot-web/src/test/java/com/neo/WebApplicationTests.java diff --git a/3.x/spring-boot-web/src/test/java/com/neo/model/UserRepositoryTests.java b/spring-boot-web/src/test/java/com/neo/model/UserRepositoryTests.java similarity index 100% rename from 3.x/spring-boot-web/src/test/java/com/neo/model/UserRepositoryTests.java rename to spring-boot-web/src/test/java/com/neo/model/UserRepositoryTests.java diff --git a/3.x/spring-boot-web/src/test/java/com/neo/web/ProPertiesTest.java b/spring-boot-web/src/test/java/com/neo/web/ProPertiesTest.java similarity index 100% rename from 3.x/spring-boot-web/src/test/java/com/neo/web/ProPertiesTest.java rename to spring-boot-web/src/test/java/com/neo/web/ProPertiesTest.java