From 7294038de4f27700f4efe6aa91e54101692ef028 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 19 Oct 2020 17:14:17 +0800 Subject: [PATCH 01/16] =?UTF-8?q?:truck:=20=E7=AE=80=E5=8C=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BE=BF=E4=BA=8E=E9=98=85?= =?UTF-8?q?=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.gitignore | 0 .../pom.xml | 6 +- .../SpringBootDemoActivitiApplication.java | 0 .../config/SecurityConfiguration.java | 0 .../xkcoding/activiti/util/SecurityUtil.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/processes/team01.bpmn | 0 ...pringBootDemoActivitiApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- .../SpringBootDemoActuatorApplication.java | 0 .../src/main/resources/application.yml | 0 ...pringBootDemoActuatorApplicationTests.java | 0 .../README.md | 0 .../admin-client}/.gitignore | 0 .../admin-client}/README.md | 0 .../admin-client}/pom.xml | 17 ++- .../SpringBootDemoAdminClientApplication.java | 0 .../client/controller/IndexController.java | 0 .../src/main/resources/application.yml | 0 ...ngBootDemoAdminClientApplicationTests.java | 0 .../admin-server}/.gitignore | 0 .../admin-server}/README.md | 0 .../admin-server}/pom.xml | 17 ++- .../SpringBootDemoAdminServerApplication.java | 0 .../src/main/resources/application.yml | 0 ...ngBootDemoAdminServerApplicationTests.java | 0 .../pom.xml | 6 +- .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../async/SpringBootDemoAsyncApplication.java | 0 .../com/xkcoding/async/task/TaskFactory.java | 0 .../src/main/resources/application.yml | 0 .../SpringBootDemoAsyncApplicationTests.java | 0 .../xkcoding/async/task/TaskFactoryTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...SpringBootDemoCacheEhcacheApplication.java | 0 .../xkcoding/cache/ehcache/entity/User.java | 0 .../cache/ehcache/service/UserService.java | 0 .../ehcache/service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/ehcache.xml | 0 ...gBootDemoCacheEhcacheApplicationTests.java | 0 .../ehcache/service/UserServiceTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoCacheRedisApplication.java | 0 .../cache/redis/config/RedisConfig.java | 0 .../com/xkcoding/cache/redis/entity/User.java | 0 .../cache/redis/service/UserService.java | 0 .../redis/service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../com/xkcoding/cache/redis/RedisTest.java | 0 ...ingBootDemoCacheRedisApplicationTests.java | 0 .../cache/redis/service/UserServiceTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoCodegenApplication.java | 0 .../xkcoding/codegen/common/IResultCode.java | 0 .../xkcoding/codegen/common/PageResult.java | 0 .../java/com/xkcoding/codegen/common/R.java | 0 .../xkcoding/codegen/common/ResultCode.java | 0 .../codegen/constants/GenConstants.java | 0 .../codegen/controller/CodeGenController.java | 0 .../xkcoding/codegen/entity/ColumnEntity.java | 0 .../xkcoding/codegen/entity/GenConfig.java | 0 .../xkcoding/codegen/entity/TableEntity.java | 0 .../xkcoding/codegen/entity/TableRequest.java | 0 .../codegen/service/CodeGenService.java | 0 .../service/impl/CodeGenServiceImpl.java | 0 .../xkcoding/codegen/utils/CodeGenUtil.java | 0 .../com/xkcoding/codegen/utils/DbUtil.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/generator.properties | 0 .../src/main/resources/jdbc_type.properties | 0 .../src/main/resources/logback-spring.xml | 8 +- .../src/main/resources/static/index.html | 0 .../resources/static/libs/axios/axios.min.js | 0 .../static/libs/datejs/date-zh-CN.js | 0 .../static/libs/iview/fonts/ionicons.svg | 0 .../static/libs/iview/fonts/ionicons.ttf | Bin .../static/libs/iview/fonts/ionicons.woff | Bin .../resources/static/libs/iview/iview.css | 0 .../resources/static/libs/iview/iview.min.js | 0 .../main/resources/static/libs/vue/vue.min.js | 0 .../resources/template/Controller.java.vm | 0 .../main/resources/template/Entity.java.vm | 0 .../main/resources/template/Mapper.java.vm | 0 .../src/main/resources/template/Mapper.xml.vm | 0 .../main/resources/template/Service.java.vm | 0 .../resources/template/ServiceImpl.java.vm | 0 .../src/main/resources/template/api.js.vm | 0 .../xkcoding/codegen/CodeGenServiceTest.java | 0 ...SpringBootDemoCodegenApplicationTests.java | 0 .../.gitignore | 0 .../Dockerfile | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoDockerApplication.java | 0 .../docker/controller/HelloController.java | 0 .../src/main/resources/application.yml | 0 .../SpringBootDemoDockerApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../dubbo-common}/.gitignore | 0 .../dubbo-common}/README.md | 0 .../dubbo-common}/pom.xml | 8 +- .../dubbo/common/service/HelloService.java | 0 .../dubbo-consumer}/.gitignore | 0 .../dubbo-consumer}/README.md | 0 demo-dubbo/dubbo-consumer/pom.xml | 67 ++++++++++ ...pringBootDemoDubboConsumerApplication.java | 0 .../consumer/controller/HelloController.java | 0 .../src/main/resources/application.yml | 0 ...BootDemoDubboConsumerApplicationTests.java | 0 .../dubbo-provider}/.gitignore | 0 .../dubbo-provider}/README.md | 0 demo-dubbo/dubbo-provider/pom.xml | 67 ++++++++++ ...pringBootDemoDubboProviderApplication.java | 0 .../provider/service/HelloServiceImpl.java | 0 .../src/main/resources/application.yml | 0 ...BootDemoDubboProviderApplicationTests.java | 0 .../pom.xml | 14 +- .../.gitignore | 0 .../README.md | 0 .../db/init.sql | 0 .../db/user.sql | 0 .../pom.xml | 6 +- ...gBootDemoDynamicDatasourceApplication.java | 0 .../annotation/DefaultDatasource.java | 0 .../aspect/DatasourceSelectorAspect.java | 0 .../config/DatasourceConfiguration.java | 0 .../dynamic/datasource/config/MyMapper.java | 0 .../config/MybatisConfiguration.java | 0 .../DatasourceConfigController.java | 0 .../datasource/controller/UserController.java | 0 .../datasource/DatasourceConfigCache.java | 0 .../DatasourceConfigContextHolder.java | 0 .../datasource/DatasourceHolder.java | 0 .../datasource/DatasourceManager.java | 0 .../datasource/DatasourceScheduler.java | 0 .../datasource/DynamicDataSource.java | 0 .../mapper/DatasourceConfigMapper.java | 0 .../dynamic/datasource/mapper/UserMapper.java | 0 .../datasource/model/DatasourceConfig.java | 0 .../dynamic/datasource/model/User.java | 0 .../dynamic/datasource/utils/SpringUtil.java | 0 .../src/main/resources/application.yml | 0 ...DemoDynamicDatasourceApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 34 ++--- .../ElasticsearchApplication.java | 0 .../xkcoding/elasticsearch/common/Result.java | 0 .../elasticsearch/common/ResultCode.java | 0 .../ElasticsearchAutoConfiguration.java | 0 .../config/ElasticsearchProperties.java | 0 .../contants/ElasticsearchConstant.java | 0 .../exception/ElasticsearchException.java | 0 .../xkcoding/elasticsearch/model/Person.java | 0 .../elasticsearch/service/PersonService.java | 0 .../base/BaseElasticsearchService.java | 0 .../service/impl/PersonServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../ElasticsearchApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...pringBootDemoElasticsearchApplication.java | 0 .../elasticsearch/constants/EsConsts.java | 0 .../xkcoding/elasticsearch/model/Person.java | 0 .../repository/PersonRepository.java | 0 .../src/main/resources/application.yml | 0 ...BootDemoElasticsearchApplicationTests.java | 0 .../repository/PersonRepositoryTest.java | 0 .../elasticsearch/template/TemplateTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../email/SpringBootDemoEmailApplication.java | 0 .../xkcoding/email/service/MailService.java | 0 .../email/service/impl/MailServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/email/test.html | 0 .../src/main/resources/static/xkcoding.png | Bin .../src/main/resources/templates/welcome.html | 0 .../java/com/xkcoding/email/PasswordTest.java | 0 .../SpringBootDemoEmailApplicationTests.java | 0 .../email/service/MailServiceTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...ngBootDemoExceptionHandlerApplication.java | 0 .../exception/handler/constant/Status.java | 0 .../handler/controller/TestController.java | 0 .../handler/exception/BaseException.java | 0 .../handler/exception/JsonException.java | 0 .../handler/exception/PageException.java | 0 .../handler/handler/DemoExceptionHandler.java | 0 .../exception/handler/model/ApiResponse.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/templates/error.html | 0 ...tDemoExceptionHandlerApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoFlywayApplication.java | 0 .../src/main/resources/application.yml | 0 .../resources/db/migration/V1_0__INIT.sql | 0 .../resources/db/migration/V1_1__ALTER.sql | 0 .../src/test/java/com/xkcoding/AppTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoGraylogApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 ...SpringBootDemoGraylogApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 demo-helloworld/pom.xml | 53 ++++++++ .../SpringBootDemoHelloworldApplication.java | 0 .../src/main/resources/application.yml | 0 ...ingBootDemoHelloworldApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 4 +- .../https/SpringBootDemoHttpsApplication.java | 0 .../xkcoding/https/config/HttpsConfig.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/server.keystore | Bin .../src/main/resources/static/index.html | 0 .../SpringBootDemoHttpsApplicationTests.java | 0 .../ssl.png | Bin .../.gitignore | 0 .../README.md | 0 {spring-boot-demo-ldap => demo-ldap}/pom.xml | 4 +- .../xkcoding/ldap/LdapDemoApplication.java | 0 .../java/com/xkcoding/ldap/api/Result.java | 0 .../com/xkcoding/ldap/api/ResultCode.java | 0 .../java/com/xkcoding/ldap/entity/Person.java | 0 .../ldap/exception/ServiceException.java | 0 .../ldap/repository/PersonRepository.java | 0 .../xkcoding/ldap/request/LoginRequest.java | 0 .../xkcoding/ldap/service/PersonService.java | 0 .../ldap/service/impl/PersonServiceImpl.java | 0 .../com/xkcoding/ldap/util/LdapUtils.java | 0 .../src/main/resources/application.yml | 0 .../ldap/LdapDemoApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- .../aop/SpringBootDemoLogAopApplication.java | 0 .../com/xkcoding/log/aop/aspectj/AopLog.java | 0 .../log/aop/controller/TestController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 10 +- .../SpringBootDemoLogAopApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 demo-logback/pom.xml | 54 ++++++++ .../SpringBootDemoLogbackApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 8 +- ...SpringBootDemoLogbackApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoMongodbApplication.java | 0 .../com/xkcoding/mongodb/model/Article.java | 0 .../mongodb/repository/ArticleRepository.java | 0 .../src/main/resources/application.yml | 0 ...SpringBootDemoMongodbApplicationTests.java | 0 .../repository/ArticleRepositoryTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoMqKafkaApplication.java | 0 .../xkcoding/mq/kafka/config/KafkaConfig.java | 0 .../mq/kafka/constants/KafkaConsts.java | 0 .../mq/kafka/handler/MessageHandler.java | 0 .../src/main/resources/application.yml | 0 ...SpringBootDemoMqKafkaApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoMqRabbitmqApplication.java | 0 .../mq/rabbitmq/config/RabbitMqConfig.java | 0 .../mq/rabbitmq/constants/RabbitConsts.java | 0 .../rabbitmq/handler/DelayQueueHandler.java | 0 .../handler/DirectQueueOneHandler.java | 0 .../rabbitmq/handler/QueueThreeHandler.java | 0 .../mq/rabbitmq/handler/QueueTwoHandler.java | 0 .../mq/rabbitmq/message/MessageStruct.java | 0 .../src/main/resources/application.yml | 0 ...ingBootDemoMqRabbitmqApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoMqRocketmqApplication.java | 0 .../src/main/resources/application.properties | 0 ...ingBootDemoMqRocketmqApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 8 +- ...BootDemoMultiDatasourceJpaApplication.java | 0 .../jpa/config/PrimaryDataSourceConfig.java | 0 .../jpa/config/PrimaryJpaConfig.java | 0 .../jpa/config/SecondDataSourceConfig.java | 0 .../jpa/config/SecondJpaConfig.java | 0 .../jpa/config/SnowflakeConfig.java | 0 .../jpa/entity/primary/PrimaryMultiTable.java | 0 .../jpa/entity/second/SecondMultiTable.java | 0 .../primary/PrimaryMultiTableRepository.java | 0 .../second/SecondMultiTableRepository.java | 0 .../src/main/resources/application.yml | 0 ...emoMultiDatasourceJpaApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 8 +- .../sql/db.sql | 0 ...DemoMultiDatasourceMybatisApplication.java | 0 .../datasource/mybatis/mapper/UserMapper.java | 0 .../multi/datasource/mybatis/model/User.java | 0 .../mybatis/service/UserService.java | 0 .../mybatis/service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 ...ultiDatasourceMybatisApplicationTests.java | 0 .../service/impl/UserServiceImplTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../neo4j/SpringBootDemoNeo4jApplication.java | 0 .../neo4j/config/CustomIdStrategy.java | 0 .../xkcoding/neo4j/constants/NeoConsts.java | 0 .../java/com/xkcoding/neo4j/model/Class.java | 0 .../java/com/xkcoding/neo4j/model/Lesson.java | 0 .../com/xkcoding/neo4j/model/Student.java | 0 .../com/xkcoding/neo4j/model/Teacher.java | 0 .../payload/ClassmateInfoGroupByLesson.java | 0 .../neo4j/payload/TeacherStudent.java | 0 .../neo4j/repository/ClassRepository.java | 0 .../neo4j/repository/LessonRepository.java | 0 .../neo4j/repository/StudentRepository.java | 0 .../neo4j/repository/TeacherRepository.java | 0 .../xkcoding/neo4j/service/NeoService.java | 0 .../src/main/resources/application.yml | 0 .../java/com/xkcoding/neo4j/Neo4jTest.java | 0 .../SpringBootDemoNeo4jApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../oauth-authorization-server}/README.adoc | 0 .../image/Code.png | Bin .../image/Confirm.png | Bin .../image/Login.png | Bin .../image/Logout.png | Bin .../oauth-authorization-server}/pom.xml | 4 +- .../oauth/SpringBootDemoOauthApplication.java | 0 .../config/ClientLoginFailureHandler.java | 0 .../config/ClientLogoutSuccessHandler.java | 0 .../Oauth2AuthorizationServerConfig.java | 0 .../Oauth2AuthorizationTokenConfig.java | 0 .../oauth/config/WebSecurityConfig.java | 0 .../xkcoding/oauth/config/package-info.java | 0 .../controller/AuthorizationController.java | 0 .../oauth/controller/Oauth2Controller.java | 0 .../oauth/controller/package-info.java | 0 .../oauth/entity/SysClientDetails.java | 0 .../com/xkcoding/oauth/entity/SysRole.java | 0 .../com/xkcoding/oauth/entity/SysUser.java | 0 .../SysClientDetailsRepository.java | 0 .../oauth/repostiory/SysUserRepository.java | 0 .../service/SysClientDetailsService.java | 0 .../oauth/service/SysUserService.java | 0 .../impl/SysClientDetailsServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../xkcoding/oauth/service/package-info.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/oauth2.jks | Bin .../src/main/resources/public.txt | 0 .../resources/templates/authorization.html | 0 .../resources/templates/common/common.html | 0 .../src/main/resources/templates/error.html | 0 .../src/main/resources/templates/login.html | 0 .../src/main/resources/templates/logout.html | 0 .../resources/templates/registerTemplate.html | 0 .../xkcoding/oauth/PasswordEncodeTest.java | 0 .../oauth/AuthorizationCodeGrantTests.java | 0 .../oauth/oauth/AuthorizationServerInfo.java | 0 .../ResourceOwnerPasswordGrantTests.java | 0 .../repostiory/SysClientDetailsTest.java | 0 .../repostiory/SysUserRepositoryTest.java | 0 .../src/test/resources/application.yml | 0 .../src/test/resources/import.sql | 0 .../src/test/resources/schema.sql | 0 .../oauth-resource-server}/README.adoc | 0 .../oauth-resource-server}/pom.xml | 4 +- .../SpringBootDemoResourceApplication.java | 0 .../config/OauthResourceServerConfig.java | 0 .../config/OauthResourceTokenConfig.java | 0 .../oauth/controller/TestController.java | 0 .../src/main/resources/application.yml | 0 .../com/xkcoding/oauth/AuthorizationTest.java | 0 .../oauth/controller/TestControllerTest.java | 0 .../pom.xml | 10 +- .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoOrmBeetlsqlApplication.java | 0 .../orm/beetlsql/config/BeetlConfig.java | 0 .../xkcoding/orm/beetlsql/dao/UserDao.java | 0 .../xkcoding/orm/beetlsql/entity/User.java | 0 .../orm/beetlsql/service/UserService.java | 0 .../service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 ...ngBootDemoOrmBeetlsqlApplicationTests.java | 0 .../orm/beetlsql/service/UserServiceTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...ingBootDemoOrmJdbctemplateApplication.java | 0 .../orm/jdbctemplate/annotation/Column.java | 0 .../orm/jdbctemplate/annotation/Ignore.java | 0 .../orm/jdbctemplate/annotation/Pk.java | 0 .../orm/jdbctemplate/annotation/Table.java | 0 .../orm/jdbctemplate/constant/Const.java | 0 .../controller/UserController.java | 0 .../orm/jdbctemplate/dao/UserDao.java | 0 .../orm/jdbctemplate/dao/base/BaseDao.java | 0 .../orm/jdbctemplate/entity/User.java | 0 .../jdbctemplate/service/IUserService.java | 0 .../service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 ...otDemoOrmJdbctemplateApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../jpa/SpringBootDemoOrmJpaApplication.java | 0 .../xkcoding/orm/jpa/config/JpaConfig.java | 0 .../xkcoding/orm/jpa/entity/Department.java | 0 .../com/xkcoding/orm/jpa/entity/User.java | 0 .../jpa/entity/base/AbstractAuditModel.java | 0 .../orm/jpa/repository/DepartmentDao.java | 0 .../xkcoding/orm/jpa/repository/UserDao.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 .../SpringBootDemoOrmJpaApplicationTests.java | 0 .../orm/jpa/repository/DepartmentDaoTest.java | 0 .../orm/jpa/repository/UserDaoTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...otDemoOrmMybatisMapperPageApplication.java | 0 .../mybatis/MapperAndPage/entity/User.java | 0 .../MapperAndPage/mapper/UserMapper.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 ...oOrmMybatisMapperPageApplicationTests.java | 0 .../MapperAndPage/mapper/UserMapperTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...ringBootDemoOrmMybatisPlusApplication.java | 0 .../plus/config/CommonFieldHandler.java | 0 .../plus/config/MybatisPlusConfig.java | 0 .../orm/mybatis/plus/entity/Role.java | 0 .../orm/mybatis/plus/entity/User.java | 0 .../orm/mybatis/plus/mapper/RoleMapper.java | 0 .../orm/mybatis/plus/mapper/UserMapper.java | 0 .../orm/mybatis/plus/service/UserService.java | 0 .../plus/service/impl/UserServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 ...ootDemoOrmMybatisPlusApplicationTests.java | 0 .../plus/activerecord/ActiveRecordTest.java | 0 .../mybatis/plus/service/UserServiceTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoOrmMybatisApplication.java | 0 .../com/xkcoding/orm/mybatis/entity/User.java | 0 .../orm/mybatis/mapper/UserMapper.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 .../src/main/resources/mappers/UserMapper.xml | 0 ...ingBootDemoOrmMybatisApplicationTests.java | 0 .../orm/mybatis/mapper/UserMapperTest.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 50 +++---- .../SpringBootDemoPropertiesApplication.java | 0 .../controller/PropertyController.java | 0 .../property/ApplicationProperty.java | 0 .../property/DeveloperProperty.java | 0 ...itional-spring-configuration-metadata.json | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application.yml | 0 ...ingBootDemoPropertiesApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...ringBootDemoRatelimitGuavaApplication.java | 0 .../guava/annotation/RateLimiter.java | 0 .../guava/aspect/RateLimiterAspect.java | 0 .../guava/controller/TestController.java | 0 .../guava/handler/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yml | 0 ...ootDemoRatelimitGuavaApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...ringBootDemoRatelimitRedisApplication.java | 0 .../redis/annotation/RateLimiter.java | 0 .../redis/aspect/RateLimiterAspect.java | 0 .../ratelimit/redis/config/RedisConfig.java | 0 .../redis/controller/TestController.java | 0 .../redis/handler/GlobalExceptionHandler.java | 0 .../xkcoding/ratelimit/redis/util/IpUtil.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/scripts/redis/limit.lua | 0 ...tDemoRatelimiterRedisApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../sql/security.sql | 0 ...SpringBootDemoRbacSecurityApplication.java | 0 .../rbac/security/common/ApiResponse.java | 0 .../rbac/security/common/BaseException.java | 0 .../xkcoding/rbac/security/common/Consts.java | 0 .../rbac/security/common/IStatus.java | 0 .../rbac/security/common/PageResult.java | 0 .../xkcoding/rbac/security/common/Status.java | 0 .../rbac/security/config/CustomConfig.java | 0 .../rbac/security/config/IdConfig.java | 0 .../rbac/security/config/IgnoreConfig.java | 0 .../config/JwtAuthenticationFilter.java | 0 .../rbac/security/config/JwtConfig.java | 0 .../security/config/RbacAuthorityService.java | 0 .../rbac/security/config/RedisConfig.java | 0 .../rbac/security/config/SecurityConfig.java | 0 .../config/SecurityHandlerConfig.java | 0 .../rbac/security/config/WebMvcConfig.java | 0 .../security/controller/AuthController.java | 0 .../controller/MonitorController.java | 0 .../security/controller/TestController.java | 0 .../security/exception/SecurityException.java | 0 .../handler/GlobalExceptionHandler.java | 0 .../rbac/security/model/Permission.java | 0 .../xkcoding/rbac/security/model/Role.java | 0 .../rbac/security/model/RolePermission.java | 0 .../xkcoding/rbac/security/model/User.java | 0 .../rbac/security/model/UserRole.java | 0 .../model/unionkey/RolePermissionKey.java | 0 .../security/model/unionkey/UserRoleKey.java | 0 .../rbac/security/payload/LoginRequest.java | 0 .../rbac/security/payload/PageCondition.java | 0 .../security/repository/PermissionDao.java | 0 .../rbac/security/repository/RoleDao.java | 0 .../repository/RolePermissionDao.java | 0 .../rbac/security/repository/UserDao.java | 0 .../rbac/security/repository/UserRoleDao.java | 0 .../service/CustomUserDetailsService.java | 0 .../rbac/security/service/MonitorService.java | 0 .../xkcoding/rbac/security/util/JwtUtil.java | 0 .../xkcoding/rbac/security/util/PageUtil.java | 0 .../rbac/security/util/RedisUtil.java | 0 .../rbac/security/util/ResponseUtil.java | 0 .../rbac/security/util/SecurityUtil.java | 0 .../rbac/security/vo/JwtResponse.java | 0 .../xkcoding/rbac/security/vo/OnlineUser.java | 0 .../rbac/security/vo/UserPrincipal.java | 0 .../src/main/resources/application.yml | 0 ...gBootDemoRbacSecurityApplicationTests.java | 0 .../security/repository/DataInitTest.java | 0 .../rbac/security/repository/UserDaoTest.java | 0 .../rbac/security/util/RedisUtilTest.java | 0 .../.gitignore | 0 .../pom.xml | 6 +- .../sql/shiro.sql | 0 .../SpringBootDemoRbacShiroApplication.java | 0 .../rbac/shiro/common/IResultCode.java | 0 .../com/xkcoding/rbac/shiro/common/R.java | 0 .../rbac/shiro/common/ResultCode.java | 0 .../rbac/shiro/config/MybatisPlusConfig.java | 0 .../rbac/shiro/controller/TestController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/spy.properties | 0 ...ringBootDemoRbacShiroApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoSessionApplication.java | 0 .../xkcoding/session/config/WebMvcConfig.java | 0 .../xkcoding/session/constants/Consts.java | 0 .../session/controller/PageController.java | 0 .../interceptor/SessionInterceptor.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/login.html | 0 ...SpringBootDemoSessionApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../sql/schema.sql | 0 ...SpringBootDemoShardingJdbcApplication.java | 0 .../config/CustomSnowflakeKeyGenerator.java | 0 .../jdbc/config/DataSourceShardingConfig.java | 0 .../sharding/jdbc/mapper/OrderMapper.java | 0 .../xkcoding/sharding/jdbc/model/Order.java | 0 .../src/main/resources/application.yml | 0 ...gBootDemoShardingJdbcApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoSocialApplication.java | 0 .../social/controller/OauthController.java | 0 .../src/main/resources/application.yml | 0 .../SpringBootDemoSocialApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...pringBootDemoSwaggerBeautyApplication.java | 0 .../swagger/beauty/common/ApiResponse.java | 0 .../beauty/controller/UserController.java | 0 .../xkcoding/swagger/beauty/entity/User.java | 0 .../src/main/resources/application.yml | 0 ...BootDemoSwaggerBeautyApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoSwaggerApplication.java | 0 .../xkcoding/swagger/common/ApiResponse.java | 0 .../com/xkcoding/swagger/common/DataType.java | 0 .../xkcoding/swagger/common/ParamType.java | 0 .../swagger/config/Swagger2Config.java | 0 .../swagger/controller/UserController.java | 0 .../com/xkcoding/swagger/entity/User.java | 0 .../src/main/resources/application.yml | 0 ...SpringBootDemoSwaggerApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../init/dbTables/tables_cloudscape.sql | 0 .../init/dbTables/tables_cubrid.sql | 0 .../init/dbTables/tables_db2.sql | 0 .../init/dbTables/tables_db2_v72.sql | 0 .../init/dbTables/tables_db2_v8.sql | 0 .../init/dbTables/tables_db2_v95.sql | 0 .../init/dbTables/tables_derby.sql | 0 .../init/dbTables/tables_derby_previous.sql | 0 .../init/dbTables/tables_firebird.sql | 0 .../init/dbTables/tables_h2.sql | 0 .../init/dbTables/tables_hsqldb.sql | 0 .../init/dbTables/tables_hsqldb_old.sql | 0 .../init/dbTables/tables_informix.sql | 0 .../init/dbTables/tables_mysql.sql | 0 .../init/dbTables/tables_mysql_innodb.sql | 0 .../init/dbTables/tables_oracle.sql | 0 .../init/dbTables/tables_pointbase.sql | 0 .../init/dbTables/tables_postgres.sql | 0 .../init/dbTables/tables_sapdb.sql | 0 .../init/dbTables/tables_solid.sql | 0 .../init/dbTables/tables_sqlServer.sql | 0 .../init/dbTables/tables_sybase.sql | 0 .../pom.xml | 6 +- .../SpringBootDemoTaskQuartzApplication.java | 0 .../task/quartz/common/ApiResponse.java | 0 .../task/quartz/controller/JobController.java | 0 .../quartz/entity/domain/JobAndTrigger.java | 0 .../task/quartz/entity/form/JobForm.java | 0 .../xkcoding/task/quartz/job/HelloJob.java | 0 .../com/xkcoding/task/quartz/job/TestJob.java | 0 .../task/quartz/job/base/BaseJob.java | 0 .../task/quartz/mapper/JobMapper.java | 0 .../task/quartz/service/JobService.java | 0 .../quartz/service/impl/JobServiceImpl.java | 0 .../xkcoding/task/quartz/util/JobUtil.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/mappers/JobMapper.xml | 0 .../src/main/resources/static/job.html | 0 ...ingBootDemoTaskQuartzApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoTaskXxlJobApplication.java | 0 .../task/xxl/job/config/XxlJobConfig.java | 0 .../xxl/job/config/props/XxlJobProps.java | 0 .../controller/ManualOperateController.java | 0 .../xkcoding/task/xxl/job/task/DemoTask.java | 0 .../src/main/resources/application.yml | 0 .../.gitignore | 0 .../README.md | 0 {spring-boot-demo-task => demo-task}/pom.xml | 6 +- .../task/SpringBootDemoTaskApplication.java | 0 .../com/xkcoding/task/config/TaskConfig.java | 0 .../java/com/xkcoding/task/job/TaskJob.java | 0 .../src/main/resources/application.yml | 0 .../SpringBootDemoTaskApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...pringBootDemoTemplateBeetlApplication.java | 0 .../beetl/controller/IndexController.java | 0 .../beetl/controller/UserController.java | 0 .../xkcoding/template/beetl/model/User.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/templates/common/head.html | 0 .../main/resources/templates/page/index.btl | 0 .../main/resources/templates/page/login.btl | 0 ...BootDemoTemplateBeetlApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...pringBootDemoTemplateEnjoyApplication.java | 0 .../template/enjoy/config/EnjoyConfig.java | 0 .../enjoy/controller/IndexController.java | 0 .../enjoy/controller/UserController.java | 0 .../xkcoding/template/enjoy/model/User.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/templates/common/head.html | 0 .../main/resources/templates/page/index.html | 0 .../main/resources/templates/page/login.html | 0 ...BootDemoTemplateEnjoyApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...BootDemoTemplateFreemarkerApplication.java | 0 .../controller/IndexController.java | 0 .../freemarker/controller/UserController.java | 0 .../template/freemarker/model/User.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/templates/common/head.ftl | 0 .../main/resources/templates/page/index.ftl | 0 .../main/resources/templates/page/login.ftl | 0 ...emoTemplateFreemarkerApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 44 +++---- ...gBootDemoTemplateThymeleafApplication.java | 0 .../thymeleaf/controller/IndexController.java | 0 .../thymeleaf/controller/UserController.java | 0 .../template/thymeleaf/model/User.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/templates/common/head.html | 0 .../main/resources/templates/page/index.html | 0 .../main/resources/templates/page/login.html | 0 ...DemoTemplateThymeleafApplicationTests.java | 0 {spring-boot-demo-tio => demo-tio}/.gitignore | 0 {spring-boot-demo-tio => demo-tio}/README.md | 0 {spring-boot-demo-tio => demo-tio}/pom.xml | 4 +- .../SpringBootDemoTioApplication.java | 0 .../src/main/resources/application.properties | 0 .../SpringBootDemoTioApplicationTests.java | 0 .../.gitignore | 0 {spring-boot-demo-urule => demo-uflo}/pom.xml | 6 +- .../uflo/SpringBootDemoUfloApplication.java | 0 .../src/main/resources/application.properties | 0 .../SpringBootDemoUfloApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoUploadApplication.java | 0 .../xkcoding/upload/config/UploadConfig.java | 0 .../upload/controller/IndexController.java | 0 .../upload/controller/UploadController.java | 0 .../upload/service/IQiNiuService.java | 0 .../upload/service/impl/QiNiuServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/templates/index.html | 0 .../SpringBootDemoUploadApplicationTests.java | 0 .../.gitignore | 0 .../pom.xml | 6 +- .../SpringBootDemoUreport2Application.java | 0 .../src/main/resources/application.properties | 0 ...pringBootDemoUreport2ApplicationTests.java | 0 .../.gitignore | 0 .../pom.xml | 6 +- .../urule/SpringBootDemoUruleApplication.java | 0 .../src/main/resources/application.properties | 0 .../SpringBootDemoUruleApplicationTests.java | 0 {spring-boot-demo-war => demo-war}/.gitignore | 0 {spring-boot-demo-war => demo-war}/README.md | 0 {spring-boot-demo-war => demo-war}/pom.xml | 6 +- .../war/SpringBootDemoWarApplication.java | 0 .../src/main/resources/application.yml | 0 .../SpringBootDemoWarApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- ...gBootDemoWebsocketSocketioApplication.java | 0 .../websocket/socketio/config/DbTemplate.java | 0 .../websocket/socketio/config/Event.java | 0 .../socketio/config/ServerConfig.java | 0 .../websocket/socketio/config/WsConfig.java | 0 .../controller/MessageController.java | 0 .../socketio/handler/MessageEventHandler.java | 0 .../websocket/socketio/init/ServerRunner.java | 0 .../payload/BroadcastMessageRequest.java | 0 .../socketio/payload/GroupMessageRequest.java | 0 .../socketio/payload/JoinRequest.java | 0 .../payload/SingleMessageRequest.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/static/bootstrap.css | 0 .../src/main/resources/static/index.html | 0 .../resources/static/js/jquery-1.10.1.min.js | 0 .../main/resources/static/js/moment.min.js | 0 .../static/js/socket.io/socket.io.js | 0 ...DemoWebsocketSocketioApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 6 +- .../SpringBootDemoWebsocketApplication.java | 0 .../websocket/common/WebSocketConsts.java | 0 .../websocket/config/WebSocketConfig.java | 0 .../controller/ServerController.java | 0 .../com/xkcoding/websocket/model/Server.java | 0 .../xkcoding/websocket/model/server/Cpu.java | 0 .../xkcoding/websocket/model/server/Jvm.java | 0 .../xkcoding/websocket/model/server/Mem.java | 0 .../xkcoding/websocket/model/server/Sys.java | 0 .../websocket/model/server/SysFile.java | 0 .../com/xkcoding/websocket/payload/KV.java | 0 .../xkcoding/websocket/payload/ServerVO.java | 0 .../websocket/payload/server/CpuVO.java | 0 .../websocket/payload/server/JvmVO.java | 0 .../websocket/payload/server/MemVO.java | 0 .../websocket/payload/server/SysFileVO.java | 0 .../websocket/payload/server/SysVO.java | 0 .../xkcoding/websocket/task/ServerTask.java | 0 .../com/xkcoding/websocket/util/IpUtil.java | 0 .../xkcoding/websocket/util/ServerUtil.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/static/js/sockjs.min.js | 0 .../src/main/resources/static/js/stomp.js | 0 .../src/main/resources/static/server.html | 0 ...ringBootDemoWebsocketApplicationTests.java | 0 .../.gitignore | 0 .../README.md | 0 .../pom.xml | 8 +- .../SpringBootDemoZookeeperApplication.java | 0 .../zookeeper/annotation/LockKeyParam.java | 0 .../zookeeper/annotation/ZooLock.java | 0 .../zookeeper/aspectj/ZooLockAspect.java | 0 .../xkcoding/zookeeper/config/ZkConfig.java | 0 .../zookeeper/config/props/ZkProps.java | 0 .../src/main/resources/application.yml | 0 ...ringBootDemoZookeeperApplicationTests.java | 0 pom.xml | 122 +++++++++--------- .../spring-boot-demo-dubbo-consumer/pom.xml | 67 ---------- .../spring-boot-demo-dubbo-provider/pom.xml | 67 ---------- spring-boot-demo-helloworld/pom.xml | 53 -------- spring-boot-demo-logback/pom.xml | 54 -------- 866 files changed, 710 insertions(+), 712 deletions(-) rename {spring-boot-demo-activiti => demo-activiti}/.gitignore (100%) rename {spring-boot-demo-activiti => demo-activiti}/pom.xml (92%) rename {spring-boot-demo-activiti => demo-activiti}/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java (100%) rename {spring-boot-demo-activiti => demo-activiti}/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java (100%) rename {spring-boot-demo-activiti => demo-activiti}/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java (100%) rename {spring-boot-demo-activiti => demo-activiti}/src/main/resources/application.yml (100%) rename {spring-boot-demo-activiti => demo-activiti}/src/main/resources/processes/team01.bpmn (100%) rename {spring-boot-demo-activiti => demo-activiti}/src/test/java/com/xkcoding/activiti/SpringBootDemoActivitiApplicationTests.java (100%) rename {spring-boot-demo-actuator => demo-actuator}/.gitignore (100%) rename {spring-boot-demo-actuator => demo-actuator}/README.md (100%) rename {spring-boot-demo-actuator => demo-actuator}/pom.xml (59%) rename {spring-boot-demo-actuator => demo-actuator}/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java (100%) rename {spring-boot-demo-actuator => demo-actuator}/src/main/resources/application.yml (100%) rename {spring-boot-demo-actuator => demo-actuator}/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java (100%) rename {spring-boot-demo-admin => demo-admin}/README.md (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/.gitignore (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/README.md (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/pom.xml (88%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/src/main/java/com/xkcoding/admin/client/controller/IndexController.java (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/src/main/resources/application.yml (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-client => demo-admin/admin-client}/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/.gitignore (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/README.md (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/pom.xml (87%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/src/main/resources/application.yml (100%) rename {spring-boot-demo-admin/spring-boot-demo-admin-server => demo-admin/admin-server}/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java (100%) rename {spring-boot-demo-admin => demo-admin}/pom.xml (86%) rename {spring-boot-demo-async => demo-async}/.gitignore (100%) rename {spring-boot-demo-async => demo-async}/README.md (100%) rename {spring-boot-demo-async => demo-async}/pom.xml (91%) rename {spring-boot-demo-async => demo-async}/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java (100%) rename {spring-boot-demo-async => demo-async}/src/main/java/com/xkcoding/async/task/TaskFactory.java (100%) rename {spring-boot-demo-async => demo-async}/src/main/resources/application.yml (100%) rename {spring-boot-demo-async => demo-async}/src/test/java/com/xkcoding/async/SpringBootDemoAsyncApplicationTests.java (100%) rename {spring-boot-demo-async => demo-async}/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/.gitignore (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/README.md (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/pom.xml (92%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/java/com/xkcoding/cache/ehcache/entity/User.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/resources/application.yml (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/main/resources/ehcache.xml (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/test/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplicationTests.java (100%) rename {spring-boot-demo-cache-ehcache => demo-cache-ehcache}/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/.gitignore (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/README.md (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/pom.xml (93%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplication.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/java/com/xkcoding/cache/redis/entity/User.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/java/com/xkcoding/cache/redis/service/UserService.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/main/resources/application.yml (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/test/java/com/xkcoding/cache/redis/RedisTest.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/test/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplicationTests.java (100%) rename {spring-boot-demo-cache-redis => demo-cache-redis}/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/.gitignore (100%) rename {spring-boot-demo-codegen => demo-codegen}/README.md (100%) rename {spring-boot-demo-codegen => demo-codegen}/pom.xml (94%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/common/IResultCode.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/common/PageResult.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/common/R.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/common/ResultCode.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/constants/GenConstants.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/entity/GenConfig.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/entity/TableEntity.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/entity/TableRequest.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/service/CodeGenService.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/java/com/xkcoding/codegen/utils/DbUtil.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/application.yml (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/generator.properties (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/jdbc_type.properties (100%) rename {spring-boot-demo-logback => demo-codegen}/src/main/resources/logback-spring.xml (92%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/index.html (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/axios/axios.min.js (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/datejs/date-zh-CN.js (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/iview/fonts/ionicons.svg (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/iview/fonts/ionicons.ttf (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/iview/fonts/ionicons.woff (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/iview/iview.css (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/iview/iview.min.js (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/static/libs/vue/vue.min.js (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/Controller.java.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/Entity.java.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/Mapper.java.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/Mapper.xml.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/Service.java.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/ServiceImpl.java.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/main/resources/template/api.js.vm (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java (100%) rename {spring-boot-demo-codegen => demo-codegen}/src/test/java/com/xkcoding/codegen/SpringBootDemoCodegenApplicationTests.java (100%) rename {spring-boot-demo-docker => demo-docker}/.gitignore (100%) rename {spring-boot-demo-docker => demo-docker}/Dockerfile (100%) rename {spring-boot-demo-docker => demo-docker}/README.md (100%) rename {spring-boot-demo-docker => demo-docker}/pom.xml (94%) rename {spring-boot-demo-docker => demo-docker}/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java (100%) rename {spring-boot-demo-docker => demo-docker}/src/main/java/com/xkcoding/docker/controller/HelloController.java (100%) rename {spring-boot-demo-docker => demo-docker}/src/main/resources/application.yml (100%) rename {spring-boot-demo-docker => demo-docker}/src/test/java/com/xkcoding/docker/SpringBootDemoDockerApplicationTests.java (100%) rename {spring-boot-demo-dubbo => demo-dubbo}/.gitignore (100%) rename {spring-boot-demo-dubbo => demo-dubbo}/README.md (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-common => demo-dubbo/dubbo-common}/.gitignore (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-common => demo-dubbo/dubbo-common}/README.md (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-common => demo-dubbo/dubbo-common}/pom.xml (78%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-common => demo-dubbo/dubbo-common}/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/.gitignore (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/README.md (100%) create mode 100644 demo-dubbo/dubbo-consumer/pom.xml rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/src/main/resources/application.yml (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer => demo-dubbo/dubbo-consumer}/src/test/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplicationTests.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/.gitignore (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/README.md (100%) create mode 100644 demo-dubbo/dubbo-provider/pom.xml rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/src/main/resources/application.yml (100%) rename {spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider => demo-dubbo/dubbo-provider}/src/test/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplicationTests.java (100%) rename {spring-boot-demo-dubbo => demo-dubbo}/pom.xml (76%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/.gitignore (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/README.md (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/db/init.sql (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/db/user.sql (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/pom.xml (91%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/model/User.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/main/resources/application.yml (100%) rename {spring-boot-demo-dynamic-datasource => demo-dynamic-datasource}/src/test/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplicationTests.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/.gitignore (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/README.md (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/pom.xml (78%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/common/Result.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/model/Person.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/main/resources/application.yml (100%) rename {spring-boot-demo-elasticsearch-rest-high-level-client => demo-elasticsearch-rest-high-level-client}/src/test/java/com/xkcoding/elasticsearch/ElasticsearchApplicationTests.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/.gitignore (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/README.md (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/pom.xml (92%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/main/java/com/xkcoding/elasticsearch/model/Person.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/main/resources/application.yml (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java (100%) rename {spring-boot-demo-elasticsearch => demo-elasticsearch}/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java (100%) rename {spring-boot-demo-email => demo-email}/.gitignore (100%) rename {spring-boot-demo-email => demo-email}/README.md (100%) rename {spring-boot-demo-email => demo-email}/pom.xml (93%) rename {spring-boot-demo-email => demo-email}/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java (100%) rename {spring-boot-demo-email => demo-email}/src/main/java/com/xkcoding/email/service/MailService.java (100%) rename {spring-boot-demo-email => demo-email}/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java (100%) rename {spring-boot-demo-email => demo-email}/src/main/resources/application.yml (100%) rename {spring-boot-demo-email => demo-email}/src/main/resources/email/test.html (100%) rename {spring-boot-demo-email => demo-email}/src/main/resources/static/xkcoding.png (100%) rename {spring-boot-demo-email => demo-email}/src/main/resources/templates/welcome.html (100%) rename {spring-boot-demo-email => demo-email}/src/test/java/com/xkcoding/email/PasswordTest.java (100%) rename {spring-boot-demo-email => demo-email}/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java (100%) rename {spring-boot-demo-email => demo-email}/src/test/java/com/xkcoding/email/service/MailServiceTest.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/.gitignore (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/README.md (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/pom.xml (55%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/constant/Status.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/controller/TestController.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/exception/PageException.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/resources/application.yml (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/main/resources/templates/error.html (100%) rename {spring-boot-demo-exception-handler => demo-exception-handler}/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java (100%) rename {spring-boot-demo-flyway => demo-flyway}/.gitignore (100%) rename {spring-boot-demo-flyway => demo-flyway}/README.md (100%) rename {spring-boot-demo-flyway => demo-flyway}/pom.xml (92%) rename {spring-boot-demo-flyway => demo-flyway}/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java (100%) rename {spring-boot-demo-flyway => demo-flyway}/src/main/resources/application.yml (100%) rename {spring-boot-demo-flyway => demo-flyway}/src/main/resources/db/migration/V1_0__INIT.sql (100%) rename {spring-boot-demo-flyway => demo-flyway}/src/main/resources/db/migration/V1_1__ALTER.sql (100%) rename {spring-boot-demo-flyway => demo-flyway}/src/test/java/com/xkcoding/AppTest.java (100%) rename {spring-boot-demo-graylog => demo-graylog}/.gitignore (100%) rename {spring-boot-demo-graylog => demo-graylog}/README.md (100%) rename {spring-boot-demo-graylog => demo-graylog}/pom.xml (91%) rename {spring-boot-demo-graylog => demo-graylog}/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java (100%) rename {spring-boot-demo-graylog => demo-graylog}/src/main/resources/application.yml (100%) rename {spring-boot-demo-graylog => demo-graylog}/src/main/resources/logback-spring.xml (100%) rename {spring-boot-demo-graylog => demo-graylog}/src/test/java/com/xkcoding/graylog/SpringBootDemoGraylogApplicationTests.java (100%) rename {spring-boot-demo-helloworld => demo-helloworld}/.gitignore (100%) rename {spring-boot-demo-helloworld => demo-helloworld}/README.md (100%) create mode 100644 demo-helloworld/pom.xml rename {spring-boot-demo-helloworld => demo-helloworld}/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java (100%) rename {spring-boot-demo-helloworld => demo-helloworld}/src/main/resources/application.yml (100%) rename {spring-boot-demo-helloworld => demo-helloworld}/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java (100%) rename {spring-boot-demo-https => demo-https}/.gitignore (100%) rename {spring-boot-demo-https => demo-https}/README.md (100%) rename {spring-boot-demo-https => demo-https}/pom.xml (93%) rename {spring-boot-demo-https => demo-https}/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java (100%) rename {spring-boot-demo-https => demo-https}/src/main/java/com/xkcoding/https/config/HttpsConfig.java (100%) rename {spring-boot-demo-https => demo-https}/src/main/resources/application.yml (100%) rename {spring-boot-demo-https => demo-https}/src/main/resources/server.keystore (100%) rename {spring-boot-demo-https => demo-https}/src/main/resources/static/index.html (100%) rename {spring-boot-demo-https => demo-https}/src/test/java/com/xkcoding/https/SpringBootDemoHttpsApplicationTests.java (100%) rename {spring-boot-demo-https => demo-https}/ssl.png (100%) rename {spring-boot-demo-ldap => demo-ldap}/.gitignore (100%) rename {spring-boot-demo-ldap => demo-ldap}/README.md (100%) rename {spring-boot-demo-ldap => demo-ldap}/pom.xml (94%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/api/Result.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/api/ResultCode.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/entity/Person.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/exception/ServiceException.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/request/LoginRequest.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/service/PersonService.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/java/com/xkcoding/ldap/util/LdapUtils.java (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/main/resources/application.yml (100%) rename {spring-boot-demo-ldap => demo-ldap}/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/.gitignore (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/README.md (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/pom.xml (61%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/main/java/com/xkcoding/log/aop/controller/TestController.java (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/main/resources/application.yml (100%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/main/resources/logback-spring.xml (91%) rename {spring-boot-demo-log-aop => demo-log-aop}/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java (100%) rename {spring-boot-demo-logback => demo-logback}/.gitignore (100%) rename {spring-boot-demo-logback => demo-logback}/README.md (100%) create mode 100644 demo-logback/pom.xml rename {spring-boot-demo-logback => demo-logback}/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java (100%) rename {spring-boot-demo-logback => demo-logback}/src/main/resources/application.yml (100%) rename {spring-boot-demo-codegen => demo-logback}/src/main/resources/logback-spring.xml (92%) rename {spring-boot-demo-logback => demo-logback}/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/.gitignore (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/README.md (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/pom.xml (93%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/main/java/com/xkcoding/mongodb/model/Article.java (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/main/resources/application.yml (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/test/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplicationTests.java (100%) rename {spring-boot-demo-mongodb => demo-mongodb}/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/.gitignore (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/README.md (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/pom.xml (92%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/main/resources/application.yml (100%) rename {spring-boot-demo-mq-kafka => demo-mq-kafka}/src/test/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplicationTests.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/.gitignore (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/README.md (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/pom.xml (92%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/main/resources/application.yml (100%) rename {spring-boot-demo-mq-rabbitmq => demo-mq-rabbitmq}/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java (100%) rename {spring-boot-demo-mq-rocketmq => demo-mq-rocketmq}/.gitignore (100%) rename {spring-boot-demo-mq-rocketmq => demo-mq-rocketmq}/README.md (100%) rename {spring-boot-demo-uflo => demo-mq-rocketmq}/pom.xml (91%) rename {spring-boot-demo-mq-rocketmq => demo-mq-rocketmq}/src/main/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplication.java (100%) rename {spring-boot-demo-mq-rocketmq => demo-mq-rocketmq}/src/main/resources/application.properties (100%) rename {spring-boot-demo-mq-rocketmq => demo-mq-rocketmq}/src/test/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplicationTests.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/.gitignore (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/README.md (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/pom.xml (91%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/main/resources/application.yml (100%) rename {spring-boot-demo-multi-datasource-jpa => demo-multi-datasource-jpa}/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/.gitignore (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/README.md (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/pom.xml (91%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/sql/db.sql (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/main/resources/application.yml (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/test/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplicationTests.java (100%) rename {spring-boot-demo-multi-datasource-mybatis => demo-multi-datasource-mybatis}/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/.gitignore (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/README.md (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/pom.xml (93%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/model/Class.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/model/Lesson.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/model/Student.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/model/Teacher.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/java/com/xkcoding/neo4j/service/NeoService.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/main/resources/application.yml (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/test/java/com/xkcoding/neo4j/Neo4jTest.java (100%) rename {spring-boot-demo-neo4j => demo-neo4j}/src/test/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplicationTests.java (100%) rename {spring-boot-demo-oauth => demo-oauth}/.gitignore (100%) rename {spring-boot-demo-oauth => demo-oauth}/README.md (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/README.adoc (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/image/Code.png (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/image/Confirm.png (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/image/Login.png (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/image/Logout.png (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/pom.xml (90%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/config/package-info.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/controller/package-info.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/entity/SysRole.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/entity/SysUser.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/service/SysUserService.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/java/com/xkcoding/oauth/service/package-info.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/application.yml (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/oauth2.jks (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/public.txt (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/authorization.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/common/common.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/error.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/login.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/logout.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/main/resources/templates/registerTemplate.html (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/resources/application.yml (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/resources/import.sql (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server => demo-oauth/oauth-authorization-server}/src/test/resources/schema.sql (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/README.adoc (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/pom.xml (88%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/main/java/com/xkcoding/oauth/controller/TestController.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/main/resources/application.yml (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/test/java/com/xkcoding/oauth/AuthorizationTest.java (100%) rename {spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server => demo-oauth/oauth-resource-server}/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java (100%) rename {spring-boot-demo-oauth => demo-oauth}/pom.xml (88%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/.gitignore (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/README.md (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/pom.xml (93%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/test/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplicationTests.java (100%) rename {spring-boot-demo-orm-beetlsql => demo-orm-beetlsql}/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/.gitignore (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/README.md (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/pom.xml (60%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-jdbctemplate => demo-orm-jdbctemplate}/src/test/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplicationTests.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/.gitignore (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/README.md (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/pom.xml (93%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/entity/Department.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/entity/User.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/test/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplicationTests.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java (100%) rename {spring-boot-demo-orm-jpa => demo-orm-jpa}/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/.gitignore (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/README.md (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/pom.xml (93%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplicationTests.java (100%) rename {spring-boot-demo-orm-mybatis-mapper-page => demo-orm-mybatis-mapper-page}/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/.gitignore (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/README.md (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/pom.xml (92%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java (100%) rename {spring-boot-demo-orm-mybatis-plus => demo-orm-mybatis-plus}/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/.gitignore (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/README.md (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/pom.xml (92%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/java/com/xkcoding/orm/mybatis/entity/User.java (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/resources/application.yml (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/resources/db/data.sql (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/resources/db/schema.sql (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/main/resources/mappers/UserMapper.xml (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/test/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplicationTests.java (100%) rename {spring-boot-demo-orm-mybatis => demo-orm-mybatis}/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java (100%) rename {spring-boot-demo-properties => demo-properties}/.gitignore (100%) rename {spring-boot-demo-properties => demo-properties}/README.md (100%) rename {spring-boot-demo-properties => demo-properties}/pom.xml (60%) rename {spring-boot-demo-properties => demo-properties}/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/java/com/xkcoding/properties/controller/PropertyController.java (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/resources/application-dev.yml (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/resources/application-prod.yml (100%) rename {spring-boot-demo-properties => demo-properties}/src/main/resources/application.yml (100%) rename {spring-boot-demo-properties => demo-properties}/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/.gitignore (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/README.md (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/pom.xml (91%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/main/resources/application.yml (100%) rename {spring-boot-demo-ratelimit-guava => demo-ratelimit-guava}/src/test/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplicationTests.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/.gitignore (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/README.md (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/pom.xml (92%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/resources/application.yml (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/main/resources/scripts/redis/limit.lua (100%) rename {spring-boot-demo-ratelimit-redis => demo-ratelimit-redis}/src/test/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimiterRedisApplicationTests.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/.gitignore (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/README.md (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/pom.xml (94%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/sql/security.sql (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/BaseException.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/Consts.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/IStatus.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/PageResult.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/common/Status.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/controller/TestController.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/Permission.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/Role.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/User.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/UserRole.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/main/resources/application.yml (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/test/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplicationTests.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java (100%) rename {spring-boot-demo-rbac-security => demo-rbac-security}/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/.gitignore (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/pom.xml (94%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/sql/shiro.sql (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/common/R.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/resources/application.yml (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/main/resources/spy.properties (100%) rename {spring-boot-demo-rbac-shiro => demo-rbac-shiro}/src/test/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplicationTests.java (100%) rename {spring-boot-demo-session => demo-session}/.gitignore (100%) rename {spring-boot-demo-session => demo-session}/README.md (100%) rename {spring-boot-demo-session => demo-session}/pom.xml (93%) rename {spring-boot-demo-session => demo-session}/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java (100%) rename {spring-boot-demo-session => demo-session}/src/main/java/com/xkcoding/session/config/WebMvcConfig.java (100%) rename {spring-boot-demo-session => demo-session}/src/main/java/com/xkcoding/session/constants/Consts.java (100%) rename {spring-boot-demo-session => demo-session}/src/main/java/com/xkcoding/session/controller/PageController.java (100%) rename {spring-boot-demo-session => demo-session}/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java (100%) rename {spring-boot-demo-session => demo-session}/src/main/resources/application.yml (100%) rename {spring-boot-demo-session => demo-session}/src/main/resources/templates/index.html (100%) rename {spring-boot-demo-session => demo-session}/src/main/resources/templates/login.html (100%) rename {spring-boot-demo-session => demo-session}/src/test/java/com/xkcoding/session/SpringBootDemoSessionApplicationTests.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/.gitignore (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/README.md (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/pom.xml (92%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/sql/schema.sql (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/main/resources/application.yml (100%) rename {spring-boot-demo-sharding-jdbc => demo-sharding-jdbc}/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java (100%) rename {spring-boot-demo-social => demo-social}/.gitignore (100%) rename {spring-boot-demo-social => demo-social}/README.md (100%) rename {spring-boot-demo-social => demo-social}/pom.xml (94%) rename {spring-boot-demo-social => demo-social}/src/main/java/com/xkcoding/social/SpringBootDemoSocialApplication.java (100%) rename {spring-boot-demo-social => demo-social}/src/main/java/com/xkcoding/social/controller/OauthController.java (100%) rename {spring-boot-demo-social => demo-social}/src/main/resources/application.yml (100%) rename {spring-boot-demo-social => demo-social}/src/test/java/com/xkcoding/social/SpringBootDemoSocialApplicationTests.java (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/.gitignore (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/README.md (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/pom.xml (91%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/main/java/com/xkcoding/swagger/beauty/entity/User.java (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/main/resources/application.yml (100%) rename {spring-boot-demo-swagger-beauty => demo-swagger-beauty}/src/test/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplicationTests.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/.gitignore (100%) rename {spring-boot-demo-swagger => demo-swagger}/README.md (100%) rename {spring-boot-demo-swagger => demo-swagger}/pom.xml (93%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/common/ApiResponse.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/common/DataType.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/common/ParamType.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/controller/UserController.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/java/com/xkcoding/swagger/entity/User.java (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/main/resources/application.yml (100%) rename {spring-boot-demo-swagger => demo-swagger}/src/test/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplicationTests.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/.gitignore (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/README.md (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_cloudscape.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_cubrid.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_db2.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_db2_v72.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_db2_v8.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_db2_v95.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_derby.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_derby_previous.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_firebird.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_h2.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_hsqldb.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_hsqldb_old.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_informix.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_mysql.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_mysql_innodb.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_oracle.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_pointbase.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_postgres.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_sapdb.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_solid.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_sqlServer.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/init/dbTables/tables_sybase.sql (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/pom.xml (94%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/controller/JobController.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/job/TestJob.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/service/JobService.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/resources/application.yml (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/resources/mappers/JobMapper.xml (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/main/resources/static/job.html (100%) rename {spring-boot-demo-task-quartz => demo-task-quartz}/src/test/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplicationTests.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/.gitignore (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/README.md (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/pom.xml (93%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/java/com/xkcoding/task/xxl/job/SpringBootDemoTaskXxlJobApplication.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/java/com/xkcoding/task/xxl/job/config/XxlJobConfig.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/java/com/xkcoding/task/xxl/job/config/props/XxlJobProps.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/java/com/xkcoding/task/xxl/job/controller/ManualOperateController.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/java/com/xkcoding/task/xxl/job/task/DemoTask.java (100%) rename {spring-boot-demo-task-xxl-job => demo-task-xxl-job}/src/main/resources/application.yml (100%) rename {spring-boot-demo-task => demo-task}/.gitignore (100%) rename {spring-boot-demo-task => demo-task}/README.md (100%) rename {spring-boot-demo-task => demo-task}/pom.xml (93%) rename {spring-boot-demo-task => demo-task}/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java (100%) rename {spring-boot-demo-task => demo-task}/src/main/java/com/xkcoding/task/config/TaskConfig.java (100%) rename {spring-boot-demo-task => demo-task}/src/main/java/com/xkcoding/task/job/TaskJob.java (100%) rename {spring-boot-demo-task => demo-task}/src/main/resources/application.yml (100%) rename {spring-boot-demo-task => demo-task}/src/test/java/com/xkcoding/task/SpringBootDemoTaskApplicationTests.java (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/.gitignore (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/README.md (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/pom.xml (59%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/java/com/xkcoding/template/beetl/controller/UserController.java (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/java/com/xkcoding/template/beetl/model/User.java (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/resources/application.yml (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/resources/templates/common/head.html (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/resources/templates/page/index.btl (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/main/resources/templates/page/login.btl (100%) rename {spring-boot-demo-template-beetl => demo-template-beetl}/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/.gitignore (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/README.md (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/pom.xml (58%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/java/com/xkcoding/template/enjoy/model/User.java (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/resources/application.yml (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/resources/templates/common/head.html (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/resources/templates/page/index.html (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/main/resources/templates/page/login.html (100%) rename {spring-boot-demo-template-enjoy => demo-template-enjoy}/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/.gitignore (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/README.md (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/pom.xml (57%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/java/com/xkcoding/template/freemarker/model/User.java (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/resources/application.yml (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/resources/templates/common/head.ftl (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/resources/templates/page/index.ftl (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/main/resources/templates/page/login.ftl (100%) rename {spring-boot-demo-template-freemarker => demo-template-freemarker}/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/.gitignore (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/README.md (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/pom.xml (60%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/java/com/xkcoding/template/thymeleaf/model/User.java (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/resources/application.yml (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/resources/templates/common/head.html (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/resources/templates/page/index.html (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/main/resources/templates/page/login.html (100%) rename {spring-boot-demo-template-thymeleaf => demo-template-thymeleaf}/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java (100%) rename {spring-boot-demo-tio => demo-tio}/.gitignore (100%) rename {spring-boot-demo-tio => demo-tio}/README.md (100%) rename {spring-boot-demo-tio => demo-tio}/pom.xml (93%) rename {spring-boot-demo-tio => demo-tio}/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java (100%) rename {spring-boot-demo-tio => demo-tio}/src/main/resources/application.properties (100%) rename {spring-boot-demo-tio => demo-tio}/src/test/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplicationTests.java (100%) rename {spring-boot-demo-uflo => demo-uflo}/.gitignore (100%) rename {spring-boot-demo-urule => demo-uflo}/pom.xml (90%) rename {spring-boot-demo-uflo => demo-uflo}/src/main/java/com/xkcoding/uflo/SpringBootDemoUfloApplication.java (100%) rename {spring-boot-demo-uflo => demo-uflo}/src/main/resources/application.properties (100%) rename {spring-boot-demo-uflo => demo-uflo}/src/test/java/com/xkcoding/uflo/SpringBootDemoUfloApplicationTests.java (100%) rename {spring-boot-demo-upload => demo-upload}/.gitignore (100%) rename {spring-boot-demo-upload => demo-upload}/README.md (100%) rename {spring-boot-demo-upload => demo-upload}/pom.xml (93%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/config/UploadConfig.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/controller/IndexController.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/controller/UploadController.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/service/IQiNiuService.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/resources/application.yml (100%) rename {spring-boot-demo-upload => demo-upload}/src/main/resources/templates/index.html (100%) rename {spring-boot-demo-upload => demo-upload}/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java (100%) rename {spring-boot-demo-ureport2 => demo-ureport2}/.gitignore (100%) rename {spring-boot-demo-ureport2 => demo-ureport2}/pom.xml (90%) rename {spring-boot-demo-ureport2 => demo-ureport2}/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java (100%) rename {spring-boot-demo-ureport2 => demo-ureport2}/src/main/resources/application.properties (100%) rename {spring-boot-demo-ureport2 => demo-ureport2}/src/test/java/com/xkcoding/ureport2/SpringBootDemoUreport2ApplicationTests.java (100%) rename {spring-boot-demo-urule => demo-urule}/.gitignore (100%) rename {spring-boot-demo-mq-rocketmq => demo-urule}/pom.xml (89%) rename {spring-boot-demo-urule => demo-urule}/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java (100%) rename {spring-boot-demo-urule => demo-urule}/src/main/resources/application.properties (100%) rename {spring-boot-demo-urule => demo-urule}/src/test/java/com/xkcoding/urule/SpringBootDemoUruleApplicationTests.java (100%) rename {spring-boot-demo-war => demo-war}/.gitignore (100%) rename {spring-boot-demo-war => demo-war}/README.md (100%) rename {spring-boot-demo-war => demo-war}/pom.xml (93%) rename {spring-boot-demo-war => demo-war}/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java (100%) rename {spring-boot-demo-war => demo-war}/src/main/resources/application.yml (100%) rename {spring-boot-demo-war => demo-war}/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/.gitignore (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/README.md (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/pom.xml (92%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/config/Event.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/application.yml (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/static/bootstrap.css (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/static/index.html (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/static/js/jquery-1.10.1.min.js (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/static/js/moment.min.js (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/main/resources/static/js/socket.io/socket.io.js (100%) rename {spring-boot-demo-websocket-socketio => demo-websocket-socketio}/src/test/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplicationTests.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/.gitignore (100%) rename {spring-boot-demo-websocket => demo-websocket}/README.md (100%) rename {spring-boot-demo-websocket => demo-websocket}/pom.xml (93%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/controller/ServerController.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/Server.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/server/Cpu.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/server/Jvm.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/server/Mem.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/server/Sys.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/model/server/SysFile.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/KV.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/ServerVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/task/ServerTask.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/util/IpUtil.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/java/com/xkcoding/websocket/util/ServerUtil.java (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/resources/application.yml (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/resources/static/js/sockjs.min.js (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/resources/static/js/stomp.js (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/main/resources/static/server.html (100%) rename {spring-boot-demo-websocket => demo-websocket}/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/.gitignore (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/README.md (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/pom.xml (93%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/main/resources/application.yml (100%) rename {spring-boot-demo-zookeeper => demo-zookeeper}/src/test/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplicationTests.java (100%) delete mode 100644 spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/pom.xml delete mode 100644 spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/pom.xml delete mode 100644 spring-boot-demo-helloworld/pom.xml delete mode 100644 spring-boot-demo-logback/pom.xml diff --git a/spring-boot-demo-activiti/.gitignore b/demo-activiti/.gitignore similarity index 100% rename from spring-boot-demo-activiti/.gitignore rename to demo-activiti/.gitignore diff --git a/spring-boot-demo-activiti/pom.xml b/demo-activiti/pom.xml similarity index 92% rename from spring-boot-demo-activiti/pom.xml rename to demo-activiti/pom.xml index 7c547e99d..e82420d05 100644 --- a/spring-boot-demo-activiti/pom.xml +++ b/demo-activiti/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-activiti + demo-activiti 1.0.0-SNAPSHOT jar - spring-boot-demo-activiti + demo-activiti Demo project for Spring Boot @@ -59,7 +59,7 @@ - spring-boot-demo-activiti + demo-activiti org.springframework.boot diff --git a/spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java b/demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java similarity index 100% rename from spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java rename to demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java diff --git a/spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java similarity index 100% rename from spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java rename to demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java diff --git a/spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java b/demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java similarity index 100% rename from spring-boot-demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java rename to demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java diff --git a/spring-boot-demo-activiti/src/main/resources/application.yml b/demo-activiti/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-activiti/src/main/resources/application.yml rename to demo-activiti/src/main/resources/application.yml diff --git a/spring-boot-demo-activiti/src/main/resources/processes/team01.bpmn b/demo-activiti/src/main/resources/processes/team01.bpmn similarity index 100% rename from spring-boot-demo-activiti/src/main/resources/processes/team01.bpmn rename to demo-activiti/src/main/resources/processes/team01.bpmn diff --git a/spring-boot-demo-activiti/src/test/java/com/xkcoding/activiti/SpringBootDemoActivitiApplicationTests.java b/demo-activiti/src/test/java/com/xkcoding/activiti/SpringBootDemoActivitiApplicationTests.java similarity index 100% rename from spring-boot-demo-activiti/src/test/java/com/xkcoding/activiti/SpringBootDemoActivitiApplicationTests.java rename to demo-activiti/src/test/java/com/xkcoding/activiti/SpringBootDemoActivitiApplicationTests.java diff --git a/spring-boot-demo-actuator/.gitignore b/demo-actuator/.gitignore similarity index 100% rename from spring-boot-demo-actuator/.gitignore rename to demo-actuator/.gitignore diff --git a/spring-boot-demo-actuator/README.md b/demo-actuator/README.md similarity index 100% rename from spring-boot-demo-actuator/README.md rename to demo-actuator/README.md diff --git a/spring-boot-demo-actuator/pom.xml b/demo-actuator/pom.xml similarity index 59% rename from spring-boot-demo-actuator/pom.xml rename to demo-actuator/pom.xml index 8906c7755..7fc6aefe5 100644 --- a/spring-boot-demo-actuator/pom.xml +++ b/demo-actuator/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-actuator - 1.0.0-SNAPSHOT - jar + demo-actuator + 1.0.0-SNAPSHOT + jar - spring-boot-demo-actuator - Demo project for Spring Boot + demo-actuator + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -51,14 +51,14 @@ - - spring-boot-demo-actuator - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-actuator + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java similarity index 100% rename from spring-boot-demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java rename to demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java diff --git a/spring-boot-demo-actuator/src/main/resources/application.yml b/demo-actuator/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-actuator/src/main/resources/application.yml rename to demo-actuator/src/main/resources/application.yml diff --git a/spring-boot-demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java b/demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java similarity index 100% rename from spring-boot-demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java rename to demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java diff --git a/spring-boot-demo-admin/README.md b/demo-admin/README.md similarity index 100% rename from spring-boot-demo-admin/README.md rename to demo-admin/README.md diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/.gitignore b/demo-admin/admin-client/.gitignore similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/.gitignore rename to demo-admin/admin-client/.gitignore diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/README.md b/demo-admin/admin-client/README.md similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/README.md rename to demo-admin/admin-client/README.md diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/pom.xml b/demo-admin/admin-client/pom.xml similarity index 88% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/pom.xml rename to demo-admin/admin-client/pom.xml index 53327a678..d5708b448 100644 --- a/spring-boot-demo-admin/spring-boot-demo-admin-client/pom.xml +++ b/demo-admin/admin-client/pom.xml @@ -1,21 +1,20 @@ + + com.xkcoding + demo-admin + 1.0.0-SNAPSHOT + 4.0.0 - spring-boot-demo-admin-client + admin-client 1.0.0-SNAPSHOT jar - spring-boot-demo-admin-client + admin-client Demo project for Spring Boot - - com.xkcoding - spring-boot-demo-admin - 1.0.0-SNAPSHOT - - UTF-8 UTF-8 @@ -46,7 +45,7 @@ - spring-boot-demo-admin-client + admin-client org.springframework.boot diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java rename to demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java rename to demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/resources/application.yml b/demo-admin/admin-client/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/src/main/resources/application.yml rename to demo-admin/admin-client/src/main/resources/application.yml diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java b/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java rename to demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/.gitignore b/demo-admin/admin-server/.gitignore similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/.gitignore rename to demo-admin/admin-server/.gitignore diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/README.md b/demo-admin/admin-server/README.md similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/README.md rename to demo-admin/admin-server/README.md diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/pom.xml b/demo-admin/admin-server/pom.xml similarity index 87% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/pom.xml rename to demo-admin/admin-server/pom.xml index 18b30504b..0e9f7d68a 100644 --- a/spring-boot-demo-admin/spring-boot-demo-admin-server/pom.xml +++ b/demo-admin/admin-server/pom.xml @@ -1,21 +1,20 @@ + + com.xkcoding + demo-admin + 1.0.0-SNAPSHOT + 4.0.0 - spring-boot-demo-admin-server + demo-admin-server 1.0.0-SNAPSHOT jar - spring-boot-demo-admin-server + admin-server Demo project for Spring Boot - - com.xkcoding - spring-boot-demo-admin - 1.0.0-SNAPSHOT - - UTF-8 UTF-8 @@ -41,7 +40,7 @@ - spring-boot-demo-admin-server + admin-server org.springframework.boot diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java b/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java rename to demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/src/main/resources/application.yml b/demo-admin/admin-server/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/src/main/resources/application.yml rename to demo-admin/admin-server/src/main/resources/application.yml diff --git a/spring-boot-demo-admin/spring-boot-demo-admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java b/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java similarity index 100% rename from spring-boot-demo-admin/spring-boot-demo-admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java rename to demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java diff --git a/spring-boot-demo-admin/pom.xml b/demo-admin/pom.xml similarity index 86% rename from spring-boot-demo-admin/pom.xml rename to demo-admin/pom.xml index 6d1db690b..eccaa84b5 100644 --- a/spring-boot-demo-admin/pom.xml +++ b/demo-admin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - spring-boot-demo-admin + demo-admin pom @@ -17,8 +17,8 @@ - spring-boot-demo-admin-client - spring-boot-demo-admin-server + admin-client + admin-server diff --git a/spring-boot-demo-async/.gitignore b/demo-async/.gitignore similarity index 100% rename from spring-boot-demo-async/.gitignore rename to demo-async/.gitignore diff --git a/spring-boot-demo-async/README.md b/demo-async/README.md similarity index 100% rename from spring-boot-demo-async/README.md rename to demo-async/README.md diff --git a/spring-boot-demo-async/pom.xml b/demo-async/pom.xml similarity index 91% rename from spring-boot-demo-async/pom.xml rename to demo-async/pom.xml index c35e22163..388e38bd8 100644 --- a/spring-boot-demo-async/pom.xml +++ b/demo-async/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-async + demo-async 1.0.0-SNAPSHOT jar - spring-boot-demo-async + demo-async Demo project for Spring Boot @@ -42,7 +42,7 @@ - spring-boot-demo-async + demo-async org.springframework.boot diff --git a/spring-boot-demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java b/demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java similarity index 100% rename from spring-boot-demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java rename to demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java diff --git a/spring-boot-demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java b/demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java similarity index 100% rename from spring-boot-demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java rename to demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java diff --git a/spring-boot-demo-async/src/main/resources/application.yml b/demo-async/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-async/src/main/resources/application.yml rename to demo-async/src/main/resources/application.yml diff --git a/spring-boot-demo-async/src/test/java/com/xkcoding/async/SpringBootDemoAsyncApplicationTests.java b/demo-async/src/test/java/com/xkcoding/async/SpringBootDemoAsyncApplicationTests.java similarity index 100% rename from spring-boot-demo-async/src/test/java/com/xkcoding/async/SpringBootDemoAsyncApplicationTests.java rename to demo-async/src/test/java/com/xkcoding/async/SpringBootDemoAsyncApplicationTests.java diff --git a/spring-boot-demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java b/demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java similarity index 100% rename from spring-boot-demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java rename to demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java diff --git a/spring-boot-demo-cache-ehcache/.gitignore b/demo-cache-ehcache/.gitignore similarity index 100% rename from spring-boot-demo-cache-ehcache/.gitignore rename to demo-cache-ehcache/.gitignore diff --git a/spring-boot-demo-cache-ehcache/README.md b/demo-cache-ehcache/README.md similarity index 100% rename from spring-boot-demo-cache-ehcache/README.md rename to demo-cache-ehcache/README.md diff --git a/spring-boot-demo-cache-ehcache/pom.xml b/demo-cache-ehcache/pom.xml similarity index 92% rename from spring-boot-demo-cache-ehcache/pom.xml rename to demo-cache-ehcache/pom.xml index 62f7e9b18..8a444473a 100644 --- a/spring-boot-demo-cache-ehcache/pom.xml +++ b/demo-cache-ehcache/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-cache-ehcache + demo-cache-ehcache 1.0.0-SNAPSHOT jar - spring-boot-demo-cache-ehcache + demo-cache-ehcache Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-cache-ehcache + demo-cache-ehcache org.springframework.boot diff --git a/spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java rename to demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java diff --git a/spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java rename to demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java diff --git a/spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java rename to demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java diff --git a/spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java rename to demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-cache-ehcache/src/main/resources/application.yml b/demo-cache-ehcache/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/resources/application.yml rename to demo-cache-ehcache/src/main/resources/application.yml diff --git a/spring-boot-demo-cache-ehcache/src/main/resources/ehcache.xml b/demo-cache-ehcache/src/main/resources/ehcache.xml similarity index 100% rename from spring-boot-demo-cache-ehcache/src/main/resources/ehcache.xml rename to demo-cache-ehcache/src/main/resources/ehcache.xml diff --git a/spring-boot-demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplicationTests.java b/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplicationTests.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplicationTests.java rename to demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplicationTests.java diff --git a/spring-boot-demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java b/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java similarity index 100% rename from spring-boot-demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java rename to demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java diff --git a/spring-boot-demo-cache-redis/.gitignore b/demo-cache-redis/.gitignore similarity index 100% rename from spring-boot-demo-cache-redis/.gitignore rename to demo-cache-redis/.gitignore diff --git a/spring-boot-demo-cache-redis/README.md b/demo-cache-redis/README.md similarity index 100% rename from spring-boot-demo-cache-redis/README.md rename to demo-cache-redis/README.md diff --git a/spring-boot-demo-cache-redis/pom.xml b/demo-cache-redis/pom.xml similarity index 93% rename from spring-boot-demo-cache-redis/pom.xml rename to demo-cache-redis/pom.xml index 01fcc38a0..5f11beb26 100644 --- a/spring-boot-demo-cache-redis/pom.xml +++ b/demo-cache-redis/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-cache-redis + demo-cache-redis 1.0.0-SNAPSHOT jar - spring-boot-demo-cache-redis + demo-cache-redis Demo project for Spring Boot @@ -69,7 +69,7 @@ - spring-boot-demo-cache-redis + demo-cache-redis org.springframework.boot diff --git a/spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplication.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplication.java similarity index 100% rename from spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplication.java rename to demo-cache-redis/src/main/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplication.java diff --git a/spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java similarity index 100% rename from spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java rename to demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java diff --git a/spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java similarity index 100% rename from spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java rename to demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java diff --git a/spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java similarity index 100% rename from spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java rename to demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java diff --git a/spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java rename to demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-cache-redis/src/main/resources/application.yml b/demo-cache-redis/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-cache-redis/src/main/resources/application.yml rename to demo-cache-redis/src/main/resources/application.yml diff --git a/spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java similarity index 100% rename from spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java rename to demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java diff --git a/spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplicationTests.java b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplicationTests.java similarity index 100% rename from spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplicationTests.java rename to demo-cache-redis/src/test/java/com/xkcoding/cache/redis/SpringBootDemoCacheRedisApplicationTests.java diff --git a/spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java similarity index 100% rename from spring-boot-demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java rename to demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java diff --git a/spring-boot-demo-codegen/.gitignore b/demo-codegen/.gitignore similarity index 100% rename from spring-boot-demo-codegen/.gitignore rename to demo-codegen/.gitignore diff --git a/spring-boot-demo-codegen/README.md b/demo-codegen/README.md similarity index 100% rename from spring-boot-demo-codegen/README.md rename to demo-codegen/README.md diff --git a/spring-boot-demo-codegen/pom.xml b/demo-codegen/pom.xml similarity index 94% rename from spring-boot-demo-codegen/pom.xml rename to demo-codegen/pom.xml index d3605f7d5..eeefe1258 100644 --- a/spring-boot-demo-codegen/pom.xml +++ b/demo-codegen/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-codegen + demo-codegen 1.0.0-SNAPSHOT jar - spring-boot-demo-codegen + demo-codegen Demo project for Spring Boot @@ -86,7 +86,7 @@ - spring-boot-demo-codegen + demo-codegen org.springframework.boot diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java b/demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java b/demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java b/demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java b/demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java b/demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java diff --git a/spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java similarity index 100% rename from spring-boot-demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java rename to demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java diff --git a/spring-boot-demo-codegen/src/main/resources/application.yml b/demo-codegen/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/application.yml rename to demo-codegen/src/main/resources/application.yml diff --git a/spring-boot-demo-codegen/src/main/resources/generator.properties b/demo-codegen/src/main/resources/generator.properties similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/generator.properties rename to demo-codegen/src/main/resources/generator.properties diff --git a/spring-boot-demo-codegen/src/main/resources/jdbc_type.properties b/demo-codegen/src/main/resources/jdbc_type.properties similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/jdbc_type.properties rename to demo-codegen/src/main/resources/jdbc_type.properties diff --git a/spring-boot-demo-logback/src/main/resources/logback-spring.xml b/demo-codegen/src/main/resources/logback-spring.xml similarity index 92% rename from spring-boot-demo-logback/src/main/resources/logback-spring.xml rename to demo-codegen/src/main/resources/logback-spring.xml index 5b24b8879..dcd48fe7e 100644 --- a/spring-boot-demo-logback/src/main/resources/logback-spring.xml +++ b/demo-codegen/src/main/resources/logback-spring.xml @@ -24,11 +24,11 @@ ACCEPT - + - logs/spring-boot-demo-logback/info.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-logback/info.created_on_%d{yyyy-MM-dd}.part_%i.log 90 @@ -53,11 +53,11 @@ Error - + - logs/spring-boot-demo-logback/error.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-logback/error.created_on_%d{yyyy-MM-dd}.part_%i.log 90 diff --git a/spring-boot-demo-codegen/src/main/resources/static/index.html b/demo-codegen/src/main/resources/static/index.html similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/index.html rename to demo-codegen/src/main/resources/static/index.html diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/axios/axios.min.js b/demo-codegen/src/main/resources/static/libs/axios/axios.min.js similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/axios/axios.min.js rename to demo-codegen/src/main/resources/static/libs/axios/axios.min.js diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js b/demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js rename to demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.svg b/demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.svg similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.svg rename to demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.svg diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.ttf b/demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.ttf similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.ttf rename to demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.ttf diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.woff b/demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.woff similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.woff rename to demo-codegen/src/main/resources/static/libs/iview/fonts/ionicons.woff diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/iview/iview.css b/demo-codegen/src/main/resources/static/libs/iview/iview.css similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/iview/iview.css rename to demo-codegen/src/main/resources/static/libs/iview/iview.css diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/iview/iview.min.js b/demo-codegen/src/main/resources/static/libs/iview/iview.min.js similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/iview/iview.min.js rename to demo-codegen/src/main/resources/static/libs/iview/iview.min.js diff --git a/spring-boot-demo-codegen/src/main/resources/static/libs/vue/vue.min.js b/demo-codegen/src/main/resources/static/libs/vue/vue.min.js similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/static/libs/vue/vue.min.js rename to demo-codegen/src/main/resources/static/libs/vue/vue.min.js diff --git a/spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm b/demo-codegen/src/main/resources/template/Controller.java.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/Controller.java.vm rename to demo-codegen/src/main/resources/template/Controller.java.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm b/demo-codegen/src/main/resources/template/Entity.java.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/Entity.java.vm rename to demo-codegen/src/main/resources/template/Entity.java.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/Mapper.java.vm b/demo-codegen/src/main/resources/template/Mapper.java.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/Mapper.java.vm rename to demo-codegen/src/main/resources/template/Mapper.java.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/Mapper.xml.vm b/demo-codegen/src/main/resources/template/Mapper.xml.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/Mapper.xml.vm rename to demo-codegen/src/main/resources/template/Mapper.xml.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/Service.java.vm b/demo-codegen/src/main/resources/template/Service.java.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/Service.java.vm rename to demo-codegen/src/main/resources/template/Service.java.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/ServiceImpl.java.vm b/demo-codegen/src/main/resources/template/ServiceImpl.java.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/ServiceImpl.java.vm rename to demo-codegen/src/main/resources/template/ServiceImpl.java.vm diff --git a/spring-boot-demo-codegen/src/main/resources/template/api.js.vm b/demo-codegen/src/main/resources/template/api.js.vm similarity index 100% rename from spring-boot-demo-codegen/src/main/resources/template/api.js.vm rename to demo-codegen/src/main/resources/template/api.js.vm diff --git a/spring-boot-demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java b/demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java similarity index 100% rename from spring-boot-demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java rename to demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java diff --git a/spring-boot-demo-codegen/src/test/java/com/xkcoding/codegen/SpringBootDemoCodegenApplicationTests.java b/demo-codegen/src/test/java/com/xkcoding/codegen/SpringBootDemoCodegenApplicationTests.java similarity index 100% rename from spring-boot-demo-codegen/src/test/java/com/xkcoding/codegen/SpringBootDemoCodegenApplicationTests.java rename to demo-codegen/src/test/java/com/xkcoding/codegen/SpringBootDemoCodegenApplicationTests.java diff --git a/spring-boot-demo-docker/.gitignore b/demo-docker/.gitignore similarity index 100% rename from spring-boot-demo-docker/.gitignore rename to demo-docker/.gitignore diff --git a/spring-boot-demo-docker/Dockerfile b/demo-docker/Dockerfile similarity index 100% rename from spring-boot-demo-docker/Dockerfile rename to demo-docker/Dockerfile diff --git a/spring-boot-demo-docker/README.md b/demo-docker/README.md similarity index 100% rename from spring-boot-demo-docker/README.md rename to demo-docker/README.md diff --git a/spring-boot-demo-docker/pom.xml b/demo-docker/pom.xml similarity index 94% rename from spring-boot-demo-docker/pom.xml rename to demo-docker/pom.xml index cbbf130f7..c489b5144 100644 --- a/spring-boot-demo-docker/pom.xml +++ b/demo-docker/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-docker + demo-docker 1.0.0-SNAPSHOT jar - spring-boot-demo-docker + demo-docker Demo project for Spring Boot @@ -37,7 +37,7 @@ - spring-boot-demo-docker + demo-docker org.springframework.boot diff --git a/spring-boot-demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java b/demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java similarity index 100% rename from spring-boot-demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java rename to demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java diff --git a/spring-boot-demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java b/demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java similarity index 100% rename from spring-boot-demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java rename to demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java diff --git a/spring-boot-demo-docker/src/main/resources/application.yml b/demo-docker/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-docker/src/main/resources/application.yml rename to demo-docker/src/main/resources/application.yml diff --git a/spring-boot-demo-docker/src/test/java/com/xkcoding/docker/SpringBootDemoDockerApplicationTests.java b/demo-docker/src/test/java/com/xkcoding/docker/SpringBootDemoDockerApplicationTests.java similarity index 100% rename from spring-boot-demo-docker/src/test/java/com/xkcoding/docker/SpringBootDemoDockerApplicationTests.java rename to demo-docker/src/test/java/com/xkcoding/docker/SpringBootDemoDockerApplicationTests.java diff --git a/spring-boot-demo-dubbo/.gitignore b/demo-dubbo/.gitignore similarity index 100% rename from spring-boot-demo-dubbo/.gitignore rename to demo-dubbo/.gitignore diff --git a/spring-boot-demo-dubbo/README.md b/demo-dubbo/README.md similarity index 100% rename from spring-boot-demo-dubbo/README.md rename to demo-dubbo/README.md diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/.gitignore b/demo-dubbo/dubbo-common/.gitignore similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/.gitignore rename to demo-dubbo/dubbo-common/.gitignore diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/README.md b/demo-dubbo/dubbo-common/README.md similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/README.md rename to demo-dubbo/dubbo-common/README.md diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/pom.xml b/demo-dubbo/dubbo-common/pom.xml similarity index 78% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/pom.xml rename to demo-dubbo/dubbo-common/pom.xml index ae7272f41..c448fdf7f 100644 --- a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/pom.xml +++ b/demo-dubbo/dubbo-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - spring-boot-demo-dubbo + demo-dubbo com.xkcoding 1.0.0-SNAPSHOT 4.0.0 - spring-boot-demo-dubbo-common + dubbo-common UTF-8 @@ -18,7 +18,7 @@ - spring-boot-demo-dubbo-common + dubbo-common - \ No newline at end of file + diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java b/demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java rename to demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/.gitignore b/demo-dubbo/dubbo-consumer/.gitignore similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/.gitignore rename to demo-dubbo/dubbo-consumer/.gitignore diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/README.md b/demo-dubbo/dubbo-consumer/README.md similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/README.md rename to demo-dubbo/dubbo-consumer/README.md diff --git a/demo-dubbo/dubbo-consumer/pom.xml b/demo-dubbo/dubbo-consumer/pom.xml new file mode 100644 index 000000000..ed6db99d7 --- /dev/null +++ b/demo-dubbo/dubbo-consumer/pom.xml @@ -0,0 +1,67 @@ + + + + demo-dubbo + com.xkcoding + 1.0.0-SNAPSHOT + + 4.0.0 + + dubbo-consumer + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba.spring.boot + dubbo-spring-boot-starter + ${dubbo.starter.version} + + + + ${project.groupId} + dubbo-common + ${project.version} + + + + com.101tec + zkclient + ${zkclient.version} + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + dubbo-consumer + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java rename to demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java rename to demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/resources/application.yml b/demo-dubbo/dubbo-consumer/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/main/resources/application.yml rename to demo-dubbo/dubbo-consumer/src/main/resources/application.yml diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/test/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplicationTests.java b/demo-dubbo/dubbo-consumer/src/test/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplicationTests.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/src/test/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplicationTests.java rename to demo-dubbo/dubbo-consumer/src/test/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplicationTests.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/.gitignore b/demo-dubbo/dubbo-provider/.gitignore similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/.gitignore rename to demo-dubbo/dubbo-provider/.gitignore diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/README.md b/demo-dubbo/dubbo-provider/README.md similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/README.md rename to demo-dubbo/dubbo-provider/README.md diff --git a/demo-dubbo/dubbo-provider/pom.xml b/demo-dubbo/dubbo-provider/pom.xml new file mode 100644 index 000000000..6fdd7426f --- /dev/null +++ b/demo-dubbo/dubbo-provider/pom.xml @@ -0,0 +1,67 @@ + + + + demo-dubbo + com.xkcoding + 1.0.0-SNAPSHOT + + 4.0.0 + + dubbo-provider + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba.spring.boot + dubbo-spring-boot-starter + ${dubbo.starter.version} + + + + ${project.groupId} + dubbo-common + ${project.version} + + + + com.101tec + zkclient + ${zkclient.version} + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + dubbo-provider + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java rename to demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java rename to demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/resources/application.yml b/demo-dubbo/dubbo-provider/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/main/resources/application.yml rename to demo-dubbo/dubbo-provider/src/main/resources/application.yml diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/test/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplicationTests.java b/demo-dubbo/dubbo-provider/src/test/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplicationTests.java similarity index 100% rename from spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/src/test/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplicationTests.java rename to demo-dubbo/dubbo-provider/src/test/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplicationTests.java diff --git a/spring-boot-demo-dubbo/pom.xml b/demo-dubbo/pom.xml similarity index 76% rename from spring-boot-demo-dubbo/pom.xml rename to demo-dubbo/pom.xml index 3b4802377..3d703b3f4 100644 --- a/spring-boot-demo-dubbo/pom.xml +++ b/demo-dubbo/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-dubbo + demo-dubbo 1.0.0-SNAPSHOT - - spring-boot-demo-dubbo-common - spring-boot-demo-dubbo-provider - spring-boot-demo-dubbo-consumer - + + dubbo-common + dubbo-provider + dubbo-consumer + pom - spring-boot-demo-dubbo + demo-dubbo Demo project for Spring Boot diff --git a/spring-boot-demo-dynamic-datasource/.gitignore b/demo-dynamic-datasource/.gitignore similarity index 100% rename from spring-boot-demo-dynamic-datasource/.gitignore rename to demo-dynamic-datasource/.gitignore diff --git a/spring-boot-demo-dynamic-datasource/README.md b/demo-dynamic-datasource/README.md similarity index 100% rename from spring-boot-demo-dynamic-datasource/README.md rename to demo-dynamic-datasource/README.md diff --git a/spring-boot-demo-dynamic-datasource/db/init.sql b/demo-dynamic-datasource/db/init.sql similarity index 100% rename from spring-boot-demo-dynamic-datasource/db/init.sql rename to demo-dynamic-datasource/db/init.sql diff --git a/spring-boot-demo-dynamic-datasource/db/user.sql b/demo-dynamic-datasource/db/user.sql similarity index 100% rename from spring-boot-demo-dynamic-datasource/db/user.sql rename to demo-dynamic-datasource/db/user.sql diff --git a/spring-boot-demo-dynamic-datasource/pom.xml b/demo-dynamic-datasource/pom.xml similarity index 91% rename from spring-boot-demo-dynamic-datasource/pom.xml rename to demo-dynamic-datasource/pom.xml index 1345a4aab..af8113686 100644 --- a/spring-boot-demo-dynamic-datasource/pom.xml +++ b/demo-dynamic-datasource/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-dynamic-datasource + demo-dynamic-datasource 1.0.0-SNAPSHOT jar - spring-boot-demo-dynamic-datasource + demo-dynamic-datasource Demo project for Spring Boot @@ -59,7 +59,7 @@ - spring-boot-demo-dynamic-datasource + demo-dynamic-datasource org.springframework.boot diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java rename to demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java diff --git a/spring-boot-demo-dynamic-datasource/src/main/resources/application.yml b/demo-dynamic-datasource/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/main/resources/application.yml rename to demo-dynamic-datasource/src/main/resources/application.yml diff --git a/spring-boot-demo-dynamic-datasource/src/test/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplicationTests.java b/demo-dynamic-datasource/src/test/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplicationTests.java similarity index 100% rename from spring-boot-demo-dynamic-datasource/src/test/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplicationTests.java rename to demo-dynamic-datasource/src/test/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplicationTests.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/.gitignore b/demo-elasticsearch-rest-high-level-client/.gitignore similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/.gitignore rename to demo-elasticsearch-rest-high-level-client/.gitignore diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/README.md b/demo-elasticsearch-rest-high-level-client/README.md similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/README.md rename to demo-elasticsearch-rest-high-level-client/README.md diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/pom.xml b/demo-elasticsearch-rest-high-level-client/pom.xml similarity index 78% rename from spring-boot-demo-elasticsearch-rest-high-level-client/pom.xml rename to demo-elasticsearch-rest-high-level-client/pom.xml index 2f85b900c..c71eac81b 100644 --- a/spring-boot-demo-elasticsearch-rest-high-level-client/pom.xml +++ b/demo-elasticsearch-rest-high-level-client/pom.xml @@ -2,26 +2,26 @@ - 4.0.0 - - spring-boot-demo - com.xkcoding - 1.0.0-SNAPSHOT - + 4.0.0 + + spring-boot-demo + com.xkcoding + 1.0.0-SNAPSHOT + - spring-boot-demo-elasticsearch-rest-high-level-client - spring-boot-demo-elasticsearch-rest-high-level-client - Demo project for Spring Boot + demo-elasticsearch-rest-high-level-client + demo-elasticsearch-rest-high-level-client + Demo project for Spring Boot - - UTF-8 - UTF-8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + - + - + org.springframework.boot spring-boot-starter @@ -96,7 +96,7 @@ - spring-boot-demo-elasticsearch-rest-high-level-client + demo-elasticsearch-rest-high-level-client org.springframework.boot diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java rename to demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/main/resources/application.yml b/demo-elasticsearch-rest-high-level-client/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/main/resources/application.yml rename to demo-elasticsearch-rest-high-level-client/src/main/resources/application.yml diff --git a/spring-boot-demo-elasticsearch-rest-high-level-client/src/test/java/com/xkcoding/elasticsearch/ElasticsearchApplicationTests.java b/demo-elasticsearch-rest-high-level-client/src/test/java/com/xkcoding/elasticsearch/ElasticsearchApplicationTests.java similarity index 100% rename from spring-boot-demo-elasticsearch-rest-high-level-client/src/test/java/com/xkcoding/elasticsearch/ElasticsearchApplicationTests.java rename to demo-elasticsearch-rest-high-level-client/src/test/java/com/xkcoding/elasticsearch/ElasticsearchApplicationTests.java diff --git a/spring-boot-demo-elasticsearch/.gitignore b/demo-elasticsearch/.gitignore similarity index 100% rename from spring-boot-demo-elasticsearch/.gitignore rename to demo-elasticsearch/.gitignore diff --git a/spring-boot-demo-elasticsearch/README.md b/demo-elasticsearch/README.md similarity index 100% rename from spring-boot-demo-elasticsearch/README.md rename to demo-elasticsearch/README.md diff --git a/spring-boot-demo-elasticsearch/pom.xml b/demo-elasticsearch/pom.xml similarity index 92% rename from spring-boot-demo-elasticsearch/pom.xml rename to demo-elasticsearch/pom.xml index 340d524f9..4b93e310c 100644 --- a/spring-boot-demo-elasticsearch/pom.xml +++ b/demo-elasticsearch/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-elasticsearch + demo-elasticsearch 1.0.0-SNAPSHOT jar - spring-boot-demo-elasticsearch + demo-elasticsearch Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-elasticsearch + demo-elasticsearch org.springframework.boot diff --git a/spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java rename to demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java diff --git a/spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java rename to demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java diff --git a/spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java rename to demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java diff --git a/spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java rename to demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java diff --git a/spring-boot-demo-elasticsearch/src/main/resources/application.yml b/demo-elasticsearch/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-elasticsearch/src/main/resources/application.yml rename to demo-elasticsearch/src/main/resources/application.yml diff --git a/spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java rename to demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java diff --git a/spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java rename to demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java diff --git a/spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java similarity index 100% rename from spring-boot-demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java rename to demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java diff --git a/spring-boot-demo-email/.gitignore b/demo-email/.gitignore similarity index 100% rename from spring-boot-demo-email/.gitignore rename to demo-email/.gitignore diff --git a/spring-boot-demo-email/README.md b/demo-email/README.md similarity index 100% rename from spring-boot-demo-email/README.md rename to demo-email/README.md diff --git a/spring-boot-demo-email/pom.xml b/demo-email/pom.xml similarity index 93% rename from spring-boot-demo-email/pom.xml rename to demo-email/pom.xml index 49adcb8e8..2c7b9f4f9 100644 --- a/spring-boot-demo-email/pom.xml +++ b/demo-email/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-email + demo-email 1.0.0-SNAPSHOT jar - spring-boot-demo-email + demo-email Demo project for Spring Boot @@ -56,7 +56,7 @@ - spring-boot-demo-email + demo-email org.springframework.boot diff --git a/spring-boot-demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java b/demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java similarity index 100% rename from spring-boot-demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java rename to demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java diff --git a/spring-boot-demo-email/src/main/java/com/xkcoding/email/service/MailService.java b/demo-email/src/main/java/com/xkcoding/email/service/MailService.java similarity index 100% rename from spring-boot-demo-email/src/main/java/com/xkcoding/email/service/MailService.java rename to demo-email/src/main/java/com/xkcoding/email/service/MailService.java diff --git a/spring-boot-demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java b/demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java similarity index 100% rename from spring-boot-demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java rename to demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java diff --git a/spring-boot-demo-email/src/main/resources/application.yml b/demo-email/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-email/src/main/resources/application.yml rename to demo-email/src/main/resources/application.yml diff --git a/spring-boot-demo-email/src/main/resources/email/test.html b/demo-email/src/main/resources/email/test.html similarity index 100% rename from spring-boot-demo-email/src/main/resources/email/test.html rename to demo-email/src/main/resources/email/test.html diff --git a/spring-boot-demo-email/src/main/resources/static/xkcoding.png b/demo-email/src/main/resources/static/xkcoding.png similarity index 100% rename from spring-boot-demo-email/src/main/resources/static/xkcoding.png rename to demo-email/src/main/resources/static/xkcoding.png diff --git a/spring-boot-demo-email/src/main/resources/templates/welcome.html b/demo-email/src/main/resources/templates/welcome.html similarity index 100% rename from spring-boot-demo-email/src/main/resources/templates/welcome.html rename to demo-email/src/main/resources/templates/welcome.html diff --git a/spring-boot-demo-email/src/test/java/com/xkcoding/email/PasswordTest.java b/demo-email/src/test/java/com/xkcoding/email/PasswordTest.java similarity index 100% rename from spring-boot-demo-email/src/test/java/com/xkcoding/email/PasswordTest.java rename to demo-email/src/test/java/com/xkcoding/email/PasswordTest.java diff --git a/spring-boot-demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java b/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java similarity index 100% rename from spring-boot-demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java rename to demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java diff --git a/spring-boot-demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java b/demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java similarity index 100% rename from spring-boot-demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java rename to demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java diff --git a/spring-boot-demo-exception-handler/.gitignore b/demo-exception-handler/.gitignore similarity index 100% rename from spring-boot-demo-exception-handler/.gitignore rename to demo-exception-handler/.gitignore diff --git a/spring-boot-demo-exception-handler/README.md b/demo-exception-handler/README.md similarity index 100% rename from spring-boot-demo-exception-handler/README.md rename to demo-exception-handler/README.md diff --git a/spring-boot-demo-exception-handler/pom.xml b/demo-exception-handler/pom.xml similarity index 55% rename from spring-boot-demo-exception-handler/pom.xml rename to demo-exception-handler/pom.xml index 14e4c9545..7e543f144 100644 --- a/spring-boot-demo-exception-handler/pom.xml +++ b/demo-exception-handler/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-exception-handler - 1.0.0-SNAPSHOT - jar + demo-exception-handler + 1.0.0-SNAPSHOT + jar - spring-boot-demo-exception-handler - Demo project for Spring Boot + demo-exception-handler + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -46,14 +46,14 @@ - - spring-boot-demo-exception-handler - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-exception-handler + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java diff --git a/spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java similarity index 100% rename from spring-boot-demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java rename to demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java diff --git a/spring-boot-demo-exception-handler/src/main/resources/application.yml b/demo-exception-handler/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-exception-handler/src/main/resources/application.yml rename to demo-exception-handler/src/main/resources/application.yml diff --git a/spring-boot-demo-exception-handler/src/main/resources/templates/error.html b/demo-exception-handler/src/main/resources/templates/error.html similarity index 100% rename from spring-boot-demo-exception-handler/src/main/resources/templates/error.html rename to demo-exception-handler/src/main/resources/templates/error.html diff --git a/spring-boot-demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java b/demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java similarity index 100% rename from spring-boot-demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java rename to demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java diff --git a/spring-boot-demo-flyway/.gitignore b/demo-flyway/.gitignore similarity index 100% rename from spring-boot-demo-flyway/.gitignore rename to demo-flyway/.gitignore diff --git a/spring-boot-demo-flyway/README.md b/demo-flyway/README.md similarity index 100% rename from spring-boot-demo-flyway/README.md rename to demo-flyway/README.md diff --git a/spring-boot-demo-flyway/pom.xml b/demo-flyway/pom.xml similarity index 92% rename from spring-boot-demo-flyway/pom.xml rename to demo-flyway/pom.xml index 802f67b1b..37cf7011e 100644 --- a/spring-boot-demo-flyway/pom.xml +++ b/demo-flyway/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-flyway + demo-flyway 1.0.0-SNAPSHOT jar - spring-boot-demo-flyway + demo-flyway Demo project for Spring Boot @@ -53,7 +53,7 @@ - spring-boot-demo-flyway + demo-flyway org.springframework.boot diff --git a/spring-boot-demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java b/demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java similarity index 100% rename from spring-boot-demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java rename to demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java diff --git a/spring-boot-demo-flyway/src/main/resources/application.yml b/demo-flyway/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-flyway/src/main/resources/application.yml rename to demo-flyway/src/main/resources/application.yml diff --git a/spring-boot-demo-flyway/src/main/resources/db/migration/V1_0__INIT.sql b/demo-flyway/src/main/resources/db/migration/V1_0__INIT.sql similarity index 100% rename from spring-boot-demo-flyway/src/main/resources/db/migration/V1_0__INIT.sql rename to demo-flyway/src/main/resources/db/migration/V1_0__INIT.sql diff --git a/spring-boot-demo-flyway/src/main/resources/db/migration/V1_1__ALTER.sql b/demo-flyway/src/main/resources/db/migration/V1_1__ALTER.sql similarity index 100% rename from spring-boot-demo-flyway/src/main/resources/db/migration/V1_1__ALTER.sql rename to demo-flyway/src/main/resources/db/migration/V1_1__ALTER.sql diff --git a/spring-boot-demo-flyway/src/test/java/com/xkcoding/AppTest.java b/demo-flyway/src/test/java/com/xkcoding/AppTest.java similarity index 100% rename from spring-boot-demo-flyway/src/test/java/com/xkcoding/AppTest.java rename to demo-flyway/src/test/java/com/xkcoding/AppTest.java diff --git a/spring-boot-demo-graylog/.gitignore b/demo-graylog/.gitignore similarity index 100% rename from spring-boot-demo-graylog/.gitignore rename to demo-graylog/.gitignore diff --git a/spring-boot-demo-graylog/README.md b/demo-graylog/README.md similarity index 100% rename from spring-boot-demo-graylog/README.md rename to demo-graylog/README.md diff --git a/spring-boot-demo-graylog/pom.xml b/demo-graylog/pom.xml similarity index 91% rename from spring-boot-demo-graylog/pom.xml rename to demo-graylog/pom.xml index 167e62bd9..a27e632f3 100644 --- a/spring-boot-demo-graylog/pom.xml +++ b/demo-graylog/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-graylog + demo-graylog 1.0.0-SNAPSHOT jar - spring-boot-demo-graylog + demo-graylog Demo project for Spring Boot @@ -43,7 +43,7 @@ - spring-boot-demo-graylog + demo-graylog org.springframework.boot diff --git a/spring-boot-demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java b/demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java similarity index 100% rename from spring-boot-demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java rename to demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java diff --git a/spring-boot-demo-graylog/src/main/resources/application.yml b/demo-graylog/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-graylog/src/main/resources/application.yml rename to demo-graylog/src/main/resources/application.yml diff --git a/spring-boot-demo-graylog/src/main/resources/logback-spring.xml b/demo-graylog/src/main/resources/logback-spring.xml similarity index 100% rename from spring-boot-demo-graylog/src/main/resources/logback-spring.xml rename to demo-graylog/src/main/resources/logback-spring.xml diff --git a/spring-boot-demo-graylog/src/test/java/com/xkcoding/graylog/SpringBootDemoGraylogApplicationTests.java b/demo-graylog/src/test/java/com/xkcoding/graylog/SpringBootDemoGraylogApplicationTests.java similarity index 100% rename from spring-boot-demo-graylog/src/test/java/com/xkcoding/graylog/SpringBootDemoGraylogApplicationTests.java rename to demo-graylog/src/test/java/com/xkcoding/graylog/SpringBootDemoGraylogApplicationTests.java diff --git a/spring-boot-demo-helloworld/.gitignore b/demo-helloworld/.gitignore similarity index 100% rename from spring-boot-demo-helloworld/.gitignore rename to demo-helloworld/.gitignore diff --git a/spring-boot-demo-helloworld/README.md b/demo-helloworld/README.md similarity index 100% rename from spring-boot-demo-helloworld/README.md rename to demo-helloworld/README.md diff --git a/demo-helloworld/pom.xml b/demo-helloworld/pom.xml new file mode 100644 index 000000000..25ec2d9b2 --- /dev/null +++ b/demo-helloworld/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + demo-helloworld + 1.0.0-SNAPSHOT + jar + + demo-helloworld + Demo project for Spring Boot + + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + cn.hutool + hutool-all + + + + + demo-helloworld + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java b/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java similarity index 100% rename from spring-boot-demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java rename to demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java diff --git a/spring-boot-demo-helloworld/src/main/resources/application.yml b/demo-helloworld/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-helloworld/src/main/resources/application.yml rename to demo-helloworld/src/main/resources/application.yml diff --git a/spring-boot-demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java b/demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java similarity index 100% rename from spring-boot-demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java rename to demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java diff --git a/spring-boot-demo-https/.gitignore b/demo-https/.gitignore similarity index 100% rename from spring-boot-demo-https/.gitignore rename to demo-https/.gitignore diff --git a/spring-boot-demo-https/README.md b/demo-https/README.md similarity index 100% rename from spring-boot-demo-https/README.md rename to demo-https/README.md diff --git a/spring-boot-demo-https/pom.xml b/demo-https/pom.xml similarity index 93% rename from spring-boot-demo-https/pom.xml rename to demo-https/pom.xml index bfd1b354a..c603394ac 100644 --- a/spring-boot-demo-https/pom.xml +++ b/demo-https/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-https + demo-https 0.0.1-SNAPSHOT - spring-boot-demo-https + demo-https Demo project for Spring Boot diff --git a/spring-boot-demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java b/demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java similarity index 100% rename from spring-boot-demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java rename to demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java diff --git a/spring-boot-demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java b/demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java similarity index 100% rename from spring-boot-demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java rename to demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java diff --git a/spring-boot-demo-https/src/main/resources/application.yml b/demo-https/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-https/src/main/resources/application.yml rename to demo-https/src/main/resources/application.yml diff --git a/spring-boot-demo-https/src/main/resources/server.keystore b/demo-https/src/main/resources/server.keystore similarity index 100% rename from spring-boot-demo-https/src/main/resources/server.keystore rename to demo-https/src/main/resources/server.keystore diff --git a/spring-boot-demo-https/src/main/resources/static/index.html b/demo-https/src/main/resources/static/index.html similarity index 100% rename from spring-boot-demo-https/src/main/resources/static/index.html rename to demo-https/src/main/resources/static/index.html diff --git a/spring-boot-demo-https/src/test/java/com/xkcoding/https/SpringBootDemoHttpsApplicationTests.java b/demo-https/src/test/java/com/xkcoding/https/SpringBootDemoHttpsApplicationTests.java similarity index 100% rename from spring-boot-demo-https/src/test/java/com/xkcoding/https/SpringBootDemoHttpsApplicationTests.java rename to demo-https/src/test/java/com/xkcoding/https/SpringBootDemoHttpsApplicationTests.java diff --git a/spring-boot-demo-https/ssl.png b/demo-https/ssl.png similarity index 100% rename from spring-boot-demo-https/ssl.png rename to demo-https/ssl.png diff --git a/spring-boot-demo-ldap/.gitignore b/demo-ldap/.gitignore similarity index 100% rename from spring-boot-demo-ldap/.gitignore rename to demo-ldap/.gitignore diff --git a/spring-boot-demo-ldap/README.md b/demo-ldap/README.md similarity index 100% rename from spring-boot-demo-ldap/README.md rename to demo-ldap/README.md diff --git a/spring-boot-demo-ldap/pom.xml b/demo-ldap/pom.xml similarity index 94% rename from spring-boot-demo-ldap/pom.xml rename to demo-ldap/pom.xml index f5be7fae2..d8134d895 100644 --- a/spring-boot-demo-ldap/pom.xml +++ b/demo-ldap/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-ldap + demo-ldap 1.0.0-SNAPSHOT jar - spring-boot-demo-ldap + demo-ldap Demo project for Spring Boot diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java b/demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java b/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java b/demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java b/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java b/demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java b/demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java b/demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java b/demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java b/demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java diff --git a/spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java b/demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java similarity index 100% rename from spring-boot-demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java rename to demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java diff --git a/spring-boot-demo-ldap/src/main/resources/application.yml b/demo-ldap/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-ldap/src/main/resources/application.yml rename to demo-ldap/src/main/resources/application.yml diff --git a/spring-boot-demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java b/demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java similarity index 100% rename from spring-boot-demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java rename to demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java diff --git a/spring-boot-demo-log-aop/.gitignore b/demo-log-aop/.gitignore similarity index 100% rename from spring-boot-demo-log-aop/.gitignore rename to demo-log-aop/.gitignore diff --git a/spring-boot-demo-log-aop/README.md b/demo-log-aop/README.md similarity index 100% rename from spring-boot-demo-log-aop/README.md rename to demo-log-aop/README.md diff --git a/spring-boot-demo-log-aop/pom.xml b/demo-log-aop/pom.xml similarity index 61% rename from spring-boot-demo-log-aop/pom.xml rename to demo-log-aop/pom.xml index 17087e8d9..7113002aa 100644 --- a/spring-boot-demo-log-aop/pom.xml +++ b/demo-log-aop/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-log-aop - 1.0.0-SNAPSHOT - jar + demo-log-aop + 1.0.0-SNAPSHOT + jar - spring-boot-demo-log-aop - Demo project for Spring Boot + demo-log-aop + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -57,14 +57,14 @@ - - spring-boot-demo-log-aop - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-log-aop + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java similarity index 100% rename from spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java rename to demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java diff --git a/spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java similarity index 100% rename from spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java rename to demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java diff --git a/spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java similarity index 100% rename from spring-boot-demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java rename to demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java diff --git a/spring-boot-demo-log-aop/src/main/resources/application.yml b/demo-log-aop/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-log-aop/src/main/resources/application.yml rename to demo-log-aop/src/main/resources/application.yml diff --git a/spring-boot-demo-log-aop/src/main/resources/logback-spring.xml b/demo-log-aop/src/main/resources/logback-spring.xml similarity index 91% rename from spring-boot-demo-log-aop/src/main/resources/logback-spring.xml rename to demo-log-aop/src/main/resources/logback-spring.xml index 284bb1686..86bf301d0 100644 --- a/spring-boot-demo-log-aop/src/main/resources/logback-spring.xml +++ b/demo-log-aop/src/main/resources/logback-spring.xml @@ -22,11 +22,11 @@ ACCEPT - + - logs/spring-boot-demo-log-aop/info.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-log-aop/info.created_on_%d{yyyy-MM-dd}.part_%i.log 90 @@ -51,11 +51,11 @@ Error - + - logs/spring-boot-demo-log-aop/error.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-log-aop/error.created_on_%d{yyyy-MM-dd}.part_%i.log 90 @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/spring-boot-demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java b/demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java similarity index 100% rename from spring-boot-demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java rename to demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java diff --git a/spring-boot-demo-logback/.gitignore b/demo-logback/.gitignore similarity index 100% rename from spring-boot-demo-logback/.gitignore rename to demo-logback/.gitignore diff --git a/spring-boot-demo-logback/README.md b/demo-logback/README.md similarity index 100% rename from spring-boot-demo-logback/README.md rename to demo-logback/README.md diff --git a/demo-logback/pom.xml b/demo-logback/pom.xml new file mode 100644 index 000000000..174a1cd9c --- /dev/null +++ b/demo-logback/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + demo-logback + 1.0.0-SNAPSHOT + jar + + demo-logback + Demo project for Spring Boot + + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + true + + + + + demo-logback + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java b/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java similarity index 100% rename from spring-boot-demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java rename to demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java diff --git a/spring-boot-demo-logback/src/main/resources/application.yml b/demo-logback/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-logback/src/main/resources/application.yml rename to demo-logback/src/main/resources/application.yml diff --git a/spring-boot-demo-codegen/src/main/resources/logback-spring.xml b/demo-logback/src/main/resources/logback-spring.xml similarity index 92% rename from spring-boot-demo-codegen/src/main/resources/logback-spring.xml rename to demo-logback/src/main/resources/logback-spring.xml index 5b24b8879..dcd48fe7e 100644 --- a/spring-boot-demo-codegen/src/main/resources/logback-spring.xml +++ b/demo-logback/src/main/resources/logback-spring.xml @@ -24,11 +24,11 @@ ACCEPT - + - logs/spring-boot-demo-logback/info.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-logback/info.created_on_%d{yyyy-MM-dd}.part_%i.log 90 @@ -53,11 +53,11 @@ Error - + - logs/spring-boot-demo-logback/error.created_on_%d{yyyy-MM-dd}.part_%i.log + logs/demo-logback/error.created_on_%d{yyyy-MM-dd}.part_%i.log 90 diff --git a/spring-boot-demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java b/demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java similarity index 100% rename from spring-boot-demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java rename to demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java diff --git a/spring-boot-demo-mongodb/.gitignore b/demo-mongodb/.gitignore similarity index 100% rename from spring-boot-demo-mongodb/.gitignore rename to demo-mongodb/.gitignore diff --git a/spring-boot-demo-mongodb/README.md b/demo-mongodb/README.md similarity index 100% rename from spring-boot-demo-mongodb/README.md rename to demo-mongodb/README.md diff --git a/spring-boot-demo-mongodb/pom.xml b/demo-mongodb/pom.xml similarity index 93% rename from spring-boot-demo-mongodb/pom.xml rename to demo-mongodb/pom.xml index c88b49f2e..b63c3d4bc 100644 --- a/spring-boot-demo-mongodb/pom.xml +++ b/demo-mongodb/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-mongodb + demo-mongodb 1.0.0-SNAPSHOT jar - spring-boot-demo-mongodb + demo-mongodb Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-mongodb + demo-mongodb org.springframework.boot diff --git a/spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java similarity index 100% rename from spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java rename to demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java diff --git a/spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java similarity index 100% rename from spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java rename to demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java diff --git a/spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java similarity index 100% rename from spring-boot-demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java rename to demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java diff --git a/spring-boot-demo-mongodb/src/main/resources/application.yml b/demo-mongodb/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-mongodb/src/main/resources/application.yml rename to demo-mongodb/src/main/resources/application.yml diff --git a/spring-boot-demo-mongodb/src/test/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplicationTests.java b/demo-mongodb/src/test/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplicationTests.java similarity index 100% rename from spring-boot-demo-mongodb/src/test/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplicationTests.java rename to demo-mongodb/src/test/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplicationTests.java diff --git a/spring-boot-demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java b/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java similarity index 100% rename from spring-boot-demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java rename to demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java diff --git a/spring-boot-demo-mq-kafka/.gitignore b/demo-mq-kafka/.gitignore similarity index 100% rename from spring-boot-demo-mq-kafka/.gitignore rename to demo-mq-kafka/.gitignore diff --git a/spring-boot-demo-mq-kafka/README.md b/demo-mq-kafka/README.md similarity index 100% rename from spring-boot-demo-mq-kafka/README.md rename to demo-mq-kafka/README.md diff --git a/spring-boot-demo-mq-kafka/pom.xml b/demo-mq-kafka/pom.xml similarity index 92% rename from spring-boot-demo-mq-kafka/pom.xml rename to demo-mq-kafka/pom.xml index 6e0cb5555..6168aa966 100644 --- a/spring-boot-demo-mq-kafka/pom.xml +++ b/demo-mq-kafka/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-mq-kafka + demo-mq-kafka 1.0.0-SNAPSHOT jar - spring-boot-demo-mq-kafka + demo-mq-kafka Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-mq-kafka + demo-mq-kafka org.springframework.boot diff --git a/spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java similarity index 100% rename from spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java rename to demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java diff --git a/spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java similarity index 100% rename from spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java rename to demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java diff --git a/spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java similarity index 100% rename from spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java rename to demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java diff --git a/spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java similarity index 100% rename from spring-boot-demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java rename to demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java diff --git a/spring-boot-demo-mq-kafka/src/main/resources/application.yml b/demo-mq-kafka/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-mq-kafka/src/main/resources/application.yml rename to demo-mq-kafka/src/main/resources/application.yml diff --git a/spring-boot-demo-mq-kafka/src/test/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplicationTests.java b/demo-mq-kafka/src/test/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplicationTests.java similarity index 100% rename from spring-boot-demo-mq-kafka/src/test/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplicationTests.java rename to demo-mq-kafka/src/test/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplicationTests.java diff --git a/spring-boot-demo-mq-rabbitmq/.gitignore b/demo-mq-rabbitmq/.gitignore similarity index 100% rename from spring-boot-demo-mq-rabbitmq/.gitignore rename to demo-mq-rabbitmq/.gitignore diff --git a/spring-boot-demo-mq-rabbitmq/README.md b/demo-mq-rabbitmq/README.md similarity index 100% rename from spring-boot-demo-mq-rabbitmq/README.md rename to demo-mq-rabbitmq/README.md diff --git a/spring-boot-demo-mq-rabbitmq/pom.xml b/demo-mq-rabbitmq/pom.xml similarity index 92% rename from spring-boot-demo-mq-rabbitmq/pom.xml rename to demo-mq-rabbitmq/pom.xml index f44287024..fcb1f2890 100644 --- a/spring-boot-demo-mq-rabbitmq/pom.xml +++ b/demo-mq-rabbitmq/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-mq-rabbitmq + demo-mq-rabbitmq 1.0.0-SNAPSHOT jar - spring-boot-demo-mq-rabbitmq + demo-mq-rabbitmq Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-mq-rabbitmq + demo-mq-rabbitmq org.springframework.boot diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java rename to demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java diff --git a/spring-boot-demo-mq-rabbitmq/src/main/resources/application.yml b/demo-mq-rabbitmq/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/main/resources/application.yml rename to demo-mq-rabbitmq/src/main/resources/application.yml diff --git a/spring-boot-demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java b/demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java similarity index 100% rename from spring-boot-demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java rename to demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java diff --git a/spring-boot-demo-mq-rocketmq/.gitignore b/demo-mq-rocketmq/.gitignore similarity index 100% rename from spring-boot-demo-mq-rocketmq/.gitignore rename to demo-mq-rocketmq/.gitignore diff --git a/spring-boot-demo-mq-rocketmq/README.md b/demo-mq-rocketmq/README.md similarity index 100% rename from spring-boot-demo-mq-rocketmq/README.md rename to demo-mq-rocketmq/README.md diff --git a/spring-boot-demo-uflo/pom.xml b/demo-mq-rocketmq/pom.xml similarity index 91% rename from spring-boot-demo-uflo/pom.xml rename to demo-mq-rocketmq/pom.xml index e4ea002e5..0369f8fc9 100644 --- a/spring-boot-demo-uflo/pom.xml +++ b/demo-mq-rocketmq/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-uflo + demo-mq-rocketmq 1.0.0-SNAPSHOT jar - spring-boot-demo-uflo + demo-mq-rocketmq Demo project for Spring Boot @@ -36,7 +36,7 @@ - spring-boot-demo-uflo + demo-mq-rocketmq org.springframework.boot diff --git a/spring-boot-demo-mq-rocketmq/src/main/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplication.java b/demo-mq-rocketmq/src/main/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplication.java similarity index 100% rename from spring-boot-demo-mq-rocketmq/src/main/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplication.java rename to demo-mq-rocketmq/src/main/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplication.java diff --git a/spring-boot-demo-mq-rocketmq/src/main/resources/application.properties b/demo-mq-rocketmq/src/main/resources/application.properties similarity index 100% rename from spring-boot-demo-mq-rocketmq/src/main/resources/application.properties rename to demo-mq-rocketmq/src/main/resources/application.properties diff --git a/spring-boot-demo-mq-rocketmq/src/test/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplicationTests.java b/demo-mq-rocketmq/src/test/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplicationTests.java similarity index 100% rename from spring-boot-demo-mq-rocketmq/src/test/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplicationTests.java rename to demo-mq-rocketmq/src/test/java/com/xkcoding/mq/rocketmq/SpringBootDemoMqRocketmqApplicationTests.java diff --git a/spring-boot-demo-multi-datasource-jpa/.gitignore b/demo-multi-datasource-jpa/.gitignore similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/.gitignore rename to demo-multi-datasource-jpa/.gitignore diff --git a/spring-boot-demo-multi-datasource-jpa/README.md b/demo-multi-datasource-jpa/README.md similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/README.md rename to demo-multi-datasource-jpa/README.md diff --git a/spring-boot-demo-multi-datasource-jpa/pom.xml b/demo-multi-datasource-jpa/pom.xml similarity index 91% rename from spring-boot-demo-multi-datasource-jpa/pom.xml rename to demo-multi-datasource-jpa/pom.xml index 0204b3ff4..a14af77ed 100644 --- a/spring-boot-demo-multi-datasource-jpa/pom.xml +++ b/demo-multi-datasource-jpa/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-multi-datasource-jpa + demo-multi-datasource-jpa 1.0.0-SNAPSHOT jar - spring-boot-demo-multi-datasource-jpa + demo-multi-datasource-jpa Demo project for Spring Boot @@ -62,7 +62,7 @@ - spring-boot-demo-multi-datasource-jpa + demo-multi-datasource-jpa org.springframework.boot @@ -71,4 +71,4 @@ - \ No newline at end of file + diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java rename to demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java diff --git a/spring-boot-demo-multi-datasource-jpa/src/main/resources/application.yml b/demo-multi-datasource-jpa/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/main/resources/application.yml rename to demo-multi-datasource-jpa/src/main/resources/application.yml diff --git a/spring-boot-demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java b/demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java similarity index 100% rename from spring-boot-demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java rename to demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java diff --git a/spring-boot-demo-multi-datasource-mybatis/.gitignore b/demo-multi-datasource-mybatis/.gitignore similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/.gitignore rename to demo-multi-datasource-mybatis/.gitignore diff --git a/spring-boot-demo-multi-datasource-mybatis/README.md b/demo-multi-datasource-mybatis/README.md similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/README.md rename to demo-multi-datasource-mybatis/README.md diff --git a/spring-boot-demo-multi-datasource-mybatis/pom.xml b/demo-multi-datasource-mybatis/pom.xml similarity index 91% rename from spring-boot-demo-multi-datasource-mybatis/pom.xml rename to demo-multi-datasource-mybatis/pom.xml index bea8f8ba3..f4502ba2a 100644 --- a/spring-boot-demo-multi-datasource-mybatis/pom.xml +++ b/demo-multi-datasource-mybatis/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-multi-datasource-mybatis + demo-multi-datasource-mybatis 1.0.0-SNAPSHOT jar - spring-boot-demo-multi-datasource-mybatis + demo-multi-datasource-mybatis Demo project for Spring Boot @@ -69,7 +69,7 @@ - spring-boot-demo-multi-datasource-mybatis + demo-multi-datasource-mybatis org.springframework.boot @@ -78,4 +78,4 @@ - \ No newline at end of file + diff --git a/spring-boot-demo-multi-datasource-mybatis/sql/db.sql b/demo-multi-datasource-mybatis/sql/db.sql similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/sql/db.sql rename to demo-multi-datasource-mybatis/sql/db.sql diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java rename to demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java rename to demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java rename to demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java rename to demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java rename to demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/main/resources/application.yml b/demo-multi-datasource-mybatis/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/main/resources/application.yml rename to demo-multi-datasource-mybatis/src/main/resources/application.yml diff --git a/spring-boot-demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplicationTests.java b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplicationTests.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplicationTests.java rename to demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplicationTests.java diff --git a/spring-boot-demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java similarity index 100% rename from spring-boot-demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java rename to demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java diff --git a/spring-boot-demo-neo4j/.gitignore b/demo-neo4j/.gitignore similarity index 100% rename from spring-boot-demo-neo4j/.gitignore rename to demo-neo4j/.gitignore diff --git a/spring-boot-demo-neo4j/README.md b/demo-neo4j/README.md similarity index 100% rename from spring-boot-demo-neo4j/README.md rename to demo-neo4j/README.md diff --git a/spring-boot-demo-neo4j/pom.xml b/demo-neo4j/pom.xml similarity index 93% rename from spring-boot-demo-neo4j/pom.xml rename to demo-neo4j/pom.xml index 0526dee85..bf1b63f39 100644 --- a/spring-boot-demo-neo4j/pom.xml +++ b/demo-neo4j/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-neo4j + demo-neo4j 1.0.0-SNAPSHOT jar - spring-boot-demo-neo4j + demo-neo4j Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-neo4j + demo-neo4j org.springframework.boot diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java diff --git a/spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java similarity index 100% rename from spring-boot-demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java rename to demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java diff --git a/spring-boot-demo-neo4j/src/main/resources/application.yml b/demo-neo4j/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-neo4j/src/main/resources/application.yml rename to demo-neo4j/src/main/resources/application.yml diff --git a/spring-boot-demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java similarity index 100% rename from spring-boot-demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java rename to demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java diff --git a/spring-boot-demo-neo4j/src/test/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplicationTests.java b/demo-neo4j/src/test/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplicationTests.java similarity index 100% rename from spring-boot-demo-neo4j/src/test/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplicationTests.java rename to demo-neo4j/src/test/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplicationTests.java diff --git a/spring-boot-demo-oauth/.gitignore b/demo-oauth/.gitignore similarity index 100% rename from spring-boot-demo-oauth/.gitignore rename to demo-oauth/.gitignore diff --git a/spring-boot-demo-oauth/README.md b/demo-oauth/README.md similarity index 100% rename from spring-boot-demo-oauth/README.md rename to demo-oauth/README.md diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/README.adoc b/demo-oauth/oauth-authorization-server/README.adoc similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/README.adoc rename to demo-oauth/oauth-authorization-server/README.adoc diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Code.png b/demo-oauth/oauth-authorization-server/image/Code.png similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Code.png rename to demo-oauth/oauth-authorization-server/image/Code.png diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Confirm.png b/demo-oauth/oauth-authorization-server/image/Confirm.png similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Confirm.png rename to demo-oauth/oauth-authorization-server/image/Confirm.png diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Login.png b/demo-oauth/oauth-authorization-server/image/Login.png similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Login.png rename to demo-oauth/oauth-authorization-server/image/Login.png diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Logout.png b/demo-oauth/oauth-authorization-server/image/Logout.png similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/image/Logout.png rename to demo-oauth/oauth-authorization-server/image/Logout.png diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/pom.xml b/demo-oauth/oauth-authorization-server/pom.xml similarity index 90% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/pom.xml rename to demo-oauth/oauth-authorization-server/pom.xml index d4fff86e9..e1b5beeff 100644 --- a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/pom.xml +++ b/demo-oauth/oauth-authorization-server/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - spring-boot-demo-oauth + demo-oauth com.xkcoding 1.0.0-SNAPSHOT 4.0.0 - spring-boot-demo-oauth-authorization-server + oauth-authorization-server diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java rename to demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/application.yml b/demo-oauth/oauth-authorization-server/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/application.yml rename to demo-oauth/oauth-authorization-server/src/main/resources/application.yml diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/oauth2.jks b/demo-oauth/oauth-authorization-server/src/main/resources/oauth2.jks similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/oauth2.jks rename to demo-oauth/oauth-authorization-server/src/main/resources/oauth2.jks diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/public.txt b/demo-oauth/oauth-authorization-server/src/main/resources/public.txt similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/public.txt rename to demo-oauth/oauth-authorization-server/src/main/resources/public.txt diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/authorization.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/authorization.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/authorization.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/authorization.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/common/common.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/common/common.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/common/common.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/common/common.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/error.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/error.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/error.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/error.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/login.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/login.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/login.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/login.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/logout.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/logout.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/logout.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/logout.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/registerTemplate.html b/demo-oauth/oauth-authorization-server/src/main/resources/templates/registerTemplate.html similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/main/resources/templates/registerTemplate.html rename to demo-oauth/oauth-authorization-server/src/main/resources/templates/registerTemplate.html diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java rename to demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/application.yml b/demo-oauth/oauth-authorization-server/src/test/resources/application.yml similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/application.yml rename to demo-oauth/oauth-authorization-server/src/test/resources/application.yml diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/import.sql b/demo-oauth/oauth-authorization-server/src/test/resources/import.sql similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/import.sql rename to demo-oauth/oauth-authorization-server/src/test/resources/import.sql diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/schema.sql b/demo-oauth/oauth-authorization-server/src/test/resources/schema.sql similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-authorization-server/src/test/resources/schema.sql rename to demo-oauth/oauth-authorization-server/src/test/resources/schema.sql diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/README.adoc b/demo-oauth/oauth-resource-server/README.adoc similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/README.adoc rename to demo-oauth/oauth-resource-server/README.adoc diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/pom.xml b/demo-oauth/oauth-resource-server/pom.xml similarity index 88% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/pom.xml rename to demo-oauth/oauth-resource-server/pom.xml index b19d74cd7..f5eef9fa9 100644 --- a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/pom.xml +++ b/demo-oauth/oauth-resource-server/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - spring-boot-demo-oauth + demo-oauth com.xkcoding 1.0.0-SNAPSHOT 4.0.0 - spring-boot-demo-oauth-resource-server + oauth-resource-server diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java rename to demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java rename to demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java rename to demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java rename to demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/resources/application.yml b/demo-oauth/oauth-resource-server/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/main/resources/application.yml rename to demo-oauth/oauth-resource-server/src/main/resources/application.yml diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java rename to demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java diff --git a/spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java similarity index 100% rename from spring-boot-demo-oauth/spring-boot-demo-oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java rename to demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java diff --git a/spring-boot-demo-oauth/pom.xml b/demo-oauth/pom.xml similarity index 88% rename from spring-boot-demo-oauth/pom.xml rename to demo-oauth/pom.xml index dd76db305..44aeb5ff3 100644 --- a/spring-boot-demo-oauth/pom.xml +++ b/demo-oauth/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-oauth + demo-oauth 1.0.0-SNAPSHOT - spring-boot-demo-oauth-authorization-server - spring-boot-demo-oauth-resource-server + oauth-authorization-server + oauth-resource-server pom - spring-boot-demo-oauth + demo-oauth Demo project for Spring Boot @@ -72,7 +72,7 @@ - spring-boot-demo-oauth + demo-oauth org.springframework.boot diff --git a/spring-boot-demo-orm-beetlsql/.gitignore b/demo-orm-beetlsql/.gitignore similarity index 100% rename from spring-boot-demo-orm-beetlsql/.gitignore rename to demo-orm-beetlsql/.gitignore diff --git a/spring-boot-demo-orm-beetlsql/README.md b/demo-orm-beetlsql/README.md similarity index 100% rename from spring-boot-demo-orm-beetlsql/README.md rename to demo-orm-beetlsql/README.md diff --git a/spring-boot-demo-orm-beetlsql/pom.xml b/demo-orm-beetlsql/pom.xml similarity index 93% rename from spring-boot-demo-orm-beetlsql/pom.xml rename to demo-orm-beetlsql/pom.xml index 0d2c42cd1..427925bb4 100644 --- a/spring-boot-demo-orm-beetlsql/pom.xml +++ b/demo-orm-beetlsql/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-orm-beetlsql + demo-orm-beetlsql 1.0.0-SNAPSHOT jar - spring-boot-demo-orm-beetlsql + demo-orm-beetlsql Demo project for Spring Boot @@ -69,7 +69,7 @@ - spring-boot-demo-orm-beetlsql + demo-orm-beetlsql org.springframework.boot diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java rename to demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-orm-beetlsql/src/main/resources/application.yml b/demo-orm-beetlsql/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/resources/application.yml rename to demo-orm-beetlsql/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-beetlsql/src/main/resources/db/data.sql b/demo-orm-beetlsql/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/resources/db/data.sql rename to demo-orm-beetlsql/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-beetlsql/src/main/resources/db/schema.sql b/demo-orm-beetlsql/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/main/resources/db/schema.sql rename to demo-orm-beetlsql/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplicationTests.java b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplicationTests.java rename to demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplicationTests.java diff --git a/spring-boot-demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java similarity index 100% rename from spring-boot-demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java rename to demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java diff --git a/spring-boot-demo-orm-jdbctemplate/.gitignore b/demo-orm-jdbctemplate/.gitignore similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/.gitignore rename to demo-orm-jdbctemplate/.gitignore diff --git a/spring-boot-demo-orm-jdbctemplate/README.md b/demo-orm-jdbctemplate/README.md similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/README.md rename to demo-orm-jdbctemplate/README.md diff --git a/spring-boot-demo-orm-jdbctemplate/pom.xml b/demo-orm-jdbctemplate/pom.xml similarity index 60% rename from spring-boot-demo-orm-jdbctemplate/pom.xml rename to demo-orm-jdbctemplate/pom.xml index 8d31e9beb..f4e8a1613 100644 --- a/spring-boot-demo-orm-jdbctemplate/pom.xml +++ b/demo-orm-jdbctemplate/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-orm-jdbctemplate - 1.0.0-SNAPSHOT - jar + demo-orm-jdbctemplate + 1.0.0-SNAPSHOT + jar - spring-boot-demo-orm-jdbctemplate - Demo project for Spring Boot + demo-orm-jdbctemplate + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -56,14 +56,14 @@ - - spring-boot-demo-orm-jdbctemplate - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-orm-jdbctemplate + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java rename to demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/resources/application.yml b/demo-orm-jdbctemplate/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/resources/application.yml rename to demo-orm-jdbctemplate/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/resources/db/data.sql b/demo-orm-jdbctemplate/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/resources/db/data.sql rename to demo-orm-jdbctemplate/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-jdbctemplate/src/main/resources/db/schema.sql b/demo-orm-jdbctemplate/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/main/resources/db/schema.sql rename to demo-orm-jdbctemplate/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-jdbctemplate/src/test/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplicationTests.java b/demo-orm-jdbctemplate/src/test/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-jdbctemplate/src/test/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplicationTests.java rename to demo-orm-jdbctemplate/src/test/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplicationTests.java diff --git a/spring-boot-demo-orm-jpa/.gitignore b/demo-orm-jpa/.gitignore similarity index 100% rename from spring-boot-demo-orm-jpa/.gitignore rename to demo-orm-jpa/.gitignore diff --git a/spring-boot-demo-orm-jpa/README.md b/demo-orm-jpa/README.md similarity index 100% rename from spring-boot-demo-orm-jpa/README.md rename to demo-orm-jpa/README.md diff --git a/spring-boot-demo-orm-jpa/pom.xml b/demo-orm-jpa/pom.xml similarity index 93% rename from spring-boot-demo-orm-jpa/pom.xml rename to demo-orm-jpa/pom.xml index 2bd654a81..f9b7249bd 100644 --- a/spring-boot-demo-orm-jpa/pom.xml +++ b/demo-orm-jpa/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-orm-jpa + demo-orm-jpa 1.0.0-SNAPSHOT jar - spring-boot-demo-orm-jpa + demo-orm-jpa Demo project for Spring Boot @@ -62,7 +62,7 @@ - spring-boot-demo-orm-jpa + demo-orm-jpa org.springframework.boot diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java diff --git a/spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java rename to demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java diff --git a/spring-boot-demo-orm-jpa/src/main/resources/application.yml b/demo-orm-jpa/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/resources/application.yml rename to demo-orm-jpa/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-jpa/src/main/resources/db/data.sql b/demo-orm-jpa/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/resources/db/data.sql rename to demo-orm-jpa/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-jpa/src/main/resources/db/schema.sql b/demo-orm-jpa/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-jpa/src/main/resources/db/schema.sql rename to demo-orm-jpa/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplicationTests.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplicationTests.java rename to demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplicationTests.java diff --git a/spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java rename to demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java diff --git a/spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java similarity index 100% rename from spring-boot-demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java rename to demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java diff --git a/spring-boot-demo-orm-mybatis-mapper-page/.gitignore b/demo-orm-mybatis-mapper-page/.gitignore similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/.gitignore rename to demo-orm-mybatis-mapper-page/.gitignore diff --git a/spring-boot-demo-orm-mybatis-mapper-page/README.md b/demo-orm-mybatis-mapper-page/README.md similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/README.md rename to demo-orm-mybatis-mapper-page/README.md diff --git a/spring-boot-demo-orm-mybatis-mapper-page/pom.xml b/demo-orm-mybatis-mapper-page/pom.xml similarity index 93% rename from spring-boot-demo-orm-mybatis-mapper-page/pom.xml rename to demo-orm-mybatis-mapper-page/pom.xml index cf8e12ad9..0bfc5ed59 100644 --- a/spring-boot-demo-orm-mybatis-mapper-page/pom.xml +++ b/demo-orm-mybatis-mapper-page/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-orm-mybatis-mapper-page + demo-orm-mybatis-mapper-page 1.0.0-SNAPSHOT jar - spring-boot-demo-orm-mybatis-mapper-page + demo-orm-mybatis-mapper-page Demo project for Spring Boot @@ -73,7 +73,7 @@ - spring-boot-demo-orm-mybatis-mapper-page + demo-orm-mybatis-mapper-page org.springframework.boot diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java rename to demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java rename to demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java rename to demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/application.yml b/demo-orm-mybatis-mapper-page/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/application.yml rename to demo-orm-mybatis-mapper-page/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/db/data.sql b/demo-orm-mybatis-mapper-page/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/db/data.sql rename to demo-orm-mybatis-mapper-page/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/db/schema.sql b/demo-orm-mybatis-mapper-page/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/main/resources/db/schema.sql rename to demo-orm-mybatis-mapper-page/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplicationTests.java b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplicationTests.java rename to demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplicationTests.java diff --git a/spring-boot-demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java similarity index 100% rename from spring-boot-demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java rename to demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java diff --git a/spring-boot-demo-orm-mybatis-plus/.gitignore b/demo-orm-mybatis-plus/.gitignore similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/.gitignore rename to demo-orm-mybatis-plus/.gitignore diff --git a/spring-boot-demo-orm-mybatis-plus/README.md b/demo-orm-mybatis-plus/README.md similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/README.md rename to demo-orm-mybatis-plus/README.md diff --git a/spring-boot-demo-orm-mybatis-plus/pom.xml b/demo-orm-mybatis-plus/pom.xml similarity index 92% rename from spring-boot-demo-orm-mybatis-plus/pom.xml rename to demo-orm-mybatis-plus/pom.xml index e3fd9286c..9c37d04c9 100644 --- a/spring-boot-demo-orm-mybatis-plus/pom.xml +++ b/demo-orm-mybatis-plus/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-orm-mybatis-plus + demo-orm-mybatis-plus 1.0.0-SNAPSHOT jar - spring-boot-demo-orm-mybatis-plus + demo-orm-mybatis-plus Demo project for Spring Boot @@ -64,7 +64,7 @@ - spring-boot-demo-orm-mybatis-plus + demo-orm-mybatis-plus org.springframework.boot diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java rename to demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/resources/application.yml b/demo-orm-mybatis-plus/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/resources/application.yml rename to demo-orm-mybatis-plus/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/resources/db/data.sql b/demo-orm-mybatis-plus/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/resources/db/data.sql rename to demo-orm-mybatis-plus/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-mybatis-plus/src/main/resources/db/schema.sql b/demo-orm-mybatis-plus/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/main/resources/db/schema.sql rename to demo-orm-mybatis-plus/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java rename to demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java rename to demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java diff --git a/spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java similarity index 100% rename from spring-boot-demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java rename to demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java diff --git a/spring-boot-demo-orm-mybatis/.gitignore b/demo-orm-mybatis/.gitignore similarity index 100% rename from spring-boot-demo-orm-mybatis/.gitignore rename to demo-orm-mybatis/.gitignore diff --git a/spring-boot-demo-orm-mybatis/README.md b/demo-orm-mybatis/README.md similarity index 100% rename from spring-boot-demo-orm-mybatis/README.md rename to demo-orm-mybatis/README.md diff --git a/spring-boot-demo-orm-mybatis/pom.xml b/demo-orm-mybatis/pom.xml similarity index 92% rename from spring-boot-demo-orm-mybatis/pom.xml rename to demo-orm-mybatis/pom.xml index 48eb617ee..57cf5e5c1 100644 --- a/spring-boot-demo-orm-mybatis/pom.xml +++ b/demo-orm-mybatis/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-orm-mybatis + demo-orm-mybatis 1.0.0-SNAPSHOT jar - spring-boot-demo-orm-mybatis + demo-orm-mybatis Demo project for Spring Boot @@ -59,7 +59,7 @@ - spring-boot-demo-orm-mybatis + demo-orm-mybatis org.springframework.boot diff --git a/spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java rename to demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java diff --git a/spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java rename to demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java diff --git a/spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java rename to demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java diff --git a/spring-boot-demo-orm-mybatis/src/main/resources/application.yml b/demo-orm-mybatis/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/resources/application.yml rename to demo-orm-mybatis/src/main/resources/application.yml diff --git a/spring-boot-demo-orm-mybatis/src/main/resources/db/data.sql b/demo-orm-mybatis/src/main/resources/db/data.sql similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/resources/db/data.sql rename to demo-orm-mybatis/src/main/resources/db/data.sql diff --git a/spring-boot-demo-orm-mybatis/src/main/resources/db/schema.sql b/demo-orm-mybatis/src/main/resources/db/schema.sql similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/resources/db/schema.sql rename to demo-orm-mybatis/src/main/resources/db/schema.sql diff --git a/spring-boot-demo-orm-mybatis/src/main/resources/mappers/UserMapper.xml b/demo-orm-mybatis/src/main/resources/mappers/UserMapper.xml similarity index 100% rename from spring-boot-demo-orm-mybatis/src/main/resources/mappers/UserMapper.xml rename to demo-orm-mybatis/src/main/resources/mappers/UserMapper.xml diff --git a/spring-boot-demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplicationTests.java b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplicationTests.java similarity index 100% rename from spring-boot-demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplicationTests.java rename to demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplicationTests.java diff --git a/spring-boot-demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java similarity index 100% rename from spring-boot-demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java rename to demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java diff --git a/spring-boot-demo-properties/.gitignore b/demo-properties/.gitignore similarity index 100% rename from spring-boot-demo-properties/.gitignore rename to demo-properties/.gitignore diff --git a/spring-boot-demo-properties/README.md b/demo-properties/README.md similarity index 100% rename from spring-boot-demo-properties/README.md rename to demo-properties/README.md diff --git a/spring-boot-demo-properties/pom.xml b/demo-properties/pom.xml similarity index 60% rename from spring-boot-demo-properties/pom.xml rename to demo-properties/pom.xml index 93210d31a..75e2245d0 100644 --- a/spring-boot-demo-properties/pom.xml +++ b/demo-properties/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-properties - 1.0.0-SNAPSHOT - jar + demo-properties + 1.0.0-SNAPSHOT + jar - spring-boot-demo-properties - Demo project for Spring Boot + demo-properties + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -56,18 +56,18 @@ - - spring-boot-demo-properties - - - org.springframework.boot - spring-boot-maven-plugin - - - - - src/main/resources - true + + demo-properties + + + org.springframework.boot + spring-boot-maven-plugin + + + + + src/main/resources + true diff --git a/spring-boot-demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java similarity index 100% rename from spring-boot-demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java rename to demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java diff --git a/spring-boot-demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java similarity index 100% rename from spring-boot-demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java rename to demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java diff --git a/spring-boot-demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java similarity index 100% rename from spring-boot-demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java rename to demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java diff --git a/spring-boot-demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java similarity index 100% rename from spring-boot-demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java rename to demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java diff --git a/spring-boot-demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-boot-demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to demo-properties/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-boot-demo-properties/src/main/resources/application-dev.yml b/demo-properties/src/main/resources/application-dev.yml similarity index 100% rename from spring-boot-demo-properties/src/main/resources/application-dev.yml rename to demo-properties/src/main/resources/application-dev.yml diff --git a/spring-boot-demo-properties/src/main/resources/application-prod.yml b/demo-properties/src/main/resources/application-prod.yml similarity index 100% rename from spring-boot-demo-properties/src/main/resources/application-prod.yml rename to demo-properties/src/main/resources/application-prod.yml diff --git a/spring-boot-demo-properties/src/main/resources/application.yml b/demo-properties/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-properties/src/main/resources/application.yml rename to demo-properties/src/main/resources/application.yml diff --git a/spring-boot-demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java b/demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java similarity index 100% rename from spring-boot-demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java rename to demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java diff --git a/spring-boot-demo-ratelimit-guava/.gitignore b/demo-ratelimit-guava/.gitignore similarity index 100% rename from spring-boot-demo-ratelimit-guava/.gitignore rename to demo-ratelimit-guava/.gitignore diff --git a/spring-boot-demo-ratelimit-guava/README.md b/demo-ratelimit-guava/README.md similarity index 100% rename from spring-boot-demo-ratelimit-guava/README.md rename to demo-ratelimit-guava/README.md diff --git a/spring-boot-demo-ratelimit-guava/pom.xml b/demo-ratelimit-guava/pom.xml similarity index 91% rename from spring-boot-demo-ratelimit-guava/pom.xml rename to demo-ratelimit-guava/pom.xml index 439736c2a..437234665 100644 --- a/spring-boot-demo-ratelimit-guava/pom.xml +++ b/demo-ratelimit-guava/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-ratelimit-guava + demo-ratelimit-guava 1.0.0-SNAPSHOT jar - spring-boot-demo-ratelimit-guava + demo-ratelimit-guava Demo project for Spring Boot @@ -57,7 +57,7 @@ - spring-boot-demo-ratelimit-guava + demo-ratelimit-guava org.springframework.boot diff --git a/spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java rename to demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java diff --git a/spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java rename to demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java diff --git a/spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java rename to demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java diff --git a/spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java rename to demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java diff --git a/spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java rename to demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java diff --git a/spring-boot-demo-ratelimit-guava/src/main/resources/application.yml b/demo-ratelimit-guava/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/main/resources/application.yml rename to demo-ratelimit-guava/src/main/resources/application.yml diff --git a/spring-boot-demo-ratelimit-guava/src/test/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplicationTests.java b/demo-ratelimit-guava/src/test/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplicationTests.java similarity index 100% rename from spring-boot-demo-ratelimit-guava/src/test/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplicationTests.java rename to demo-ratelimit-guava/src/test/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplicationTests.java diff --git a/spring-boot-demo-ratelimit-redis/.gitignore b/demo-ratelimit-redis/.gitignore similarity index 100% rename from spring-boot-demo-ratelimit-redis/.gitignore rename to demo-ratelimit-redis/.gitignore diff --git a/spring-boot-demo-ratelimit-redis/README.md b/demo-ratelimit-redis/README.md similarity index 100% rename from spring-boot-demo-ratelimit-redis/README.md rename to demo-ratelimit-redis/README.md diff --git a/spring-boot-demo-ratelimit-redis/pom.xml b/demo-ratelimit-redis/pom.xml similarity index 92% rename from spring-boot-demo-ratelimit-redis/pom.xml rename to demo-ratelimit-redis/pom.xml index daf1a85a7..ed4506d13 100644 --- a/spring-boot-demo-ratelimit-redis/pom.xml +++ b/demo-ratelimit-redis/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-ratelimit-redis + demo-ratelimit-redis 1.0.0-SNAPSHOT jar - spring-boot-demo-ratelimit-redis + demo-ratelimit-redis Demo project for Spring Boot @@ -63,7 +63,7 @@ - spring-boot-demo-ratelimit-redis + demo-ratelimit-redis org.springframework.boot diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java rename to demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java diff --git a/spring-boot-demo-ratelimit-redis/src/main/resources/application.yml b/demo-ratelimit-redis/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/resources/application.yml rename to demo-ratelimit-redis/src/main/resources/application.yml diff --git a/spring-boot-demo-ratelimit-redis/src/main/resources/scripts/redis/limit.lua b/demo-ratelimit-redis/src/main/resources/scripts/redis/limit.lua similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/main/resources/scripts/redis/limit.lua rename to demo-ratelimit-redis/src/main/resources/scripts/redis/limit.lua diff --git a/spring-boot-demo-ratelimit-redis/src/test/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimiterRedisApplicationTests.java b/demo-ratelimit-redis/src/test/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimiterRedisApplicationTests.java similarity index 100% rename from spring-boot-demo-ratelimit-redis/src/test/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimiterRedisApplicationTests.java rename to demo-ratelimit-redis/src/test/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimiterRedisApplicationTests.java diff --git a/spring-boot-demo-rbac-security/.gitignore b/demo-rbac-security/.gitignore similarity index 100% rename from spring-boot-demo-rbac-security/.gitignore rename to demo-rbac-security/.gitignore diff --git a/spring-boot-demo-rbac-security/README.md b/demo-rbac-security/README.md similarity index 100% rename from spring-boot-demo-rbac-security/README.md rename to demo-rbac-security/README.md diff --git a/spring-boot-demo-rbac-security/pom.xml b/demo-rbac-security/pom.xml similarity index 94% rename from spring-boot-demo-rbac-security/pom.xml rename to demo-rbac-security/pom.xml index 56c1f99e2..b9439a526 100644 --- a/spring-boot-demo-rbac-security/pom.xml +++ b/demo-rbac-security/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-rbac-security + demo-rbac-security 1.0.0-SNAPSHOT jar - spring-boot-demo-rbac-security + demo-rbac-security Demo project for Spring Boot @@ -91,7 +91,7 @@ - spring-boot-demo-rbac-security + demo-rbac-security org.springframework.boot diff --git a/spring-boot-demo-rbac-security/sql/security.sql b/demo-rbac-security/sql/security.sql similarity index 100% rename from spring-boot-demo-rbac-security/sql/security.sql rename to demo-rbac-security/sql/security.sql diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java diff --git a/spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java similarity index 100% rename from spring-boot-demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java rename to demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java diff --git a/spring-boot-demo-rbac-security/src/main/resources/application.yml b/demo-rbac-security/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-rbac-security/src/main/resources/application.yml rename to demo-rbac-security/src/main/resources/application.yml diff --git a/spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplicationTests.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplicationTests.java similarity index 100% rename from spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplicationTests.java rename to demo-rbac-security/src/test/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplicationTests.java diff --git a/spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java similarity index 100% rename from spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java rename to demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java diff --git a/spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java similarity index 100% rename from spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java rename to demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java diff --git a/spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java similarity index 100% rename from spring-boot-demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java rename to demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java diff --git a/spring-boot-demo-rbac-shiro/.gitignore b/demo-rbac-shiro/.gitignore similarity index 100% rename from spring-boot-demo-rbac-shiro/.gitignore rename to demo-rbac-shiro/.gitignore diff --git a/spring-boot-demo-rbac-shiro/pom.xml b/demo-rbac-shiro/pom.xml similarity index 94% rename from spring-boot-demo-rbac-shiro/pom.xml rename to demo-rbac-shiro/pom.xml index 017214172..e60058221 100644 --- a/spring-boot-demo-rbac-shiro/pom.xml +++ b/demo-rbac-shiro/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-rbac-shiro + demo-rbac-shiro 1.0.0-SNAPSHOT jar - spring-boot-demo-rbac-shiro + demo-rbac-shiro Demo project for Spring Boot @@ -87,7 +87,7 @@ - spring-boot-demo-rbac-shiro + demo-rbac-shiro org.springframework.boot diff --git a/spring-boot-demo-rbac-shiro/sql/shiro.sql b/demo-rbac-shiro/sql/shiro.sql similarity index 100% rename from spring-boot-demo-rbac-shiro/sql/shiro.sql rename to demo-rbac-shiro/sql/shiro.sql diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java diff --git a/spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java rename to demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java diff --git a/spring-boot-demo-rbac-shiro/src/main/resources/application.yml b/demo-rbac-shiro/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/resources/application.yml rename to demo-rbac-shiro/src/main/resources/application.yml diff --git a/spring-boot-demo-rbac-shiro/src/main/resources/spy.properties b/demo-rbac-shiro/src/main/resources/spy.properties similarity index 100% rename from spring-boot-demo-rbac-shiro/src/main/resources/spy.properties rename to demo-rbac-shiro/src/main/resources/spy.properties diff --git a/spring-boot-demo-rbac-shiro/src/test/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplicationTests.java b/demo-rbac-shiro/src/test/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplicationTests.java similarity index 100% rename from spring-boot-demo-rbac-shiro/src/test/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplicationTests.java rename to demo-rbac-shiro/src/test/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplicationTests.java diff --git a/spring-boot-demo-session/.gitignore b/demo-session/.gitignore similarity index 100% rename from spring-boot-demo-session/.gitignore rename to demo-session/.gitignore diff --git a/spring-boot-demo-session/README.md b/demo-session/README.md similarity index 100% rename from spring-boot-demo-session/README.md rename to demo-session/README.md diff --git a/spring-boot-demo-session/pom.xml b/demo-session/pom.xml similarity index 93% rename from spring-boot-demo-session/pom.xml rename to demo-session/pom.xml index 494e6ad44..e2f73f654 100644 --- a/spring-boot-demo-session/pom.xml +++ b/demo-session/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-session + demo-session 1.0.0-SNAPSHOT jar - spring-boot-demo-session + demo-session Demo project for Spring Boot @@ -62,7 +62,7 @@ - spring-boot-demo-session + demo-session org.springframework.boot diff --git a/spring-boot-demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java b/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java similarity index 100% rename from spring-boot-demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java rename to demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java diff --git a/spring-boot-demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java b/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java similarity index 100% rename from spring-boot-demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java rename to demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java diff --git a/spring-boot-demo-session/src/main/java/com/xkcoding/session/constants/Consts.java b/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java similarity index 100% rename from spring-boot-demo-session/src/main/java/com/xkcoding/session/constants/Consts.java rename to demo-session/src/main/java/com/xkcoding/session/constants/Consts.java diff --git a/spring-boot-demo-session/src/main/java/com/xkcoding/session/controller/PageController.java b/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java similarity index 100% rename from spring-boot-demo-session/src/main/java/com/xkcoding/session/controller/PageController.java rename to demo-session/src/main/java/com/xkcoding/session/controller/PageController.java diff --git a/spring-boot-demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java b/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java similarity index 100% rename from spring-boot-demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java rename to demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java diff --git a/spring-boot-demo-session/src/main/resources/application.yml b/demo-session/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-session/src/main/resources/application.yml rename to demo-session/src/main/resources/application.yml diff --git a/spring-boot-demo-session/src/main/resources/templates/index.html b/demo-session/src/main/resources/templates/index.html similarity index 100% rename from spring-boot-demo-session/src/main/resources/templates/index.html rename to demo-session/src/main/resources/templates/index.html diff --git a/spring-boot-demo-session/src/main/resources/templates/login.html b/demo-session/src/main/resources/templates/login.html similarity index 100% rename from spring-boot-demo-session/src/main/resources/templates/login.html rename to demo-session/src/main/resources/templates/login.html diff --git a/spring-boot-demo-session/src/test/java/com/xkcoding/session/SpringBootDemoSessionApplicationTests.java b/demo-session/src/test/java/com/xkcoding/session/SpringBootDemoSessionApplicationTests.java similarity index 100% rename from spring-boot-demo-session/src/test/java/com/xkcoding/session/SpringBootDemoSessionApplicationTests.java rename to demo-session/src/test/java/com/xkcoding/session/SpringBootDemoSessionApplicationTests.java diff --git a/spring-boot-demo-sharding-jdbc/.gitignore b/demo-sharding-jdbc/.gitignore similarity index 100% rename from spring-boot-demo-sharding-jdbc/.gitignore rename to demo-sharding-jdbc/.gitignore diff --git a/spring-boot-demo-sharding-jdbc/README.md b/demo-sharding-jdbc/README.md similarity index 100% rename from spring-boot-demo-sharding-jdbc/README.md rename to demo-sharding-jdbc/README.md diff --git a/spring-boot-demo-sharding-jdbc/pom.xml b/demo-sharding-jdbc/pom.xml similarity index 92% rename from spring-boot-demo-sharding-jdbc/pom.xml rename to demo-sharding-jdbc/pom.xml index 31ee3844d..bceb35669 100644 --- a/spring-boot-demo-sharding-jdbc/pom.xml +++ b/demo-sharding-jdbc/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-sharding-jdbc + demo-sharding-jdbc 1.0.0-SNAPSHOT jar - spring-boot-demo-sharding-jdbc + demo-sharding-jdbc Demo project for Spring Boot @@ -64,7 +64,7 @@ - spring-boot-demo-sharding-jdbc + demo-sharding-jdbc org.springframework.boot diff --git a/spring-boot-demo-sharding-jdbc/sql/schema.sql b/demo-sharding-jdbc/sql/schema.sql similarity index 100% rename from spring-boot-demo-sharding-jdbc/sql/schema.sql rename to demo-sharding-jdbc/sql/schema.sql diff --git a/spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java rename to demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java diff --git a/spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java rename to demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java diff --git a/spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java rename to demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java diff --git a/spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java rename to demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java diff --git a/spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java rename to demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java diff --git a/spring-boot-demo-sharding-jdbc/src/main/resources/application.yml b/demo-sharding-jdbc/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/main/resources/application.yml rename to demo-sharding-jdbc/src/main/resources/application.yml diff --git a/spring-boot-demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java b/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java similarity index 100% rename from spring-boot-demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java rename to demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java diff --git a/spring-boot-demo-social/.gitignore b/demo-social/.gitignore similarity index 100% rename from spring-boot-demo-social/.gitignore rename to demo-social/.gitignore diff --git a/spring-boot-demo-social/README.md b/demo-social/README.md similarity index 100% rename from spring-boot-demo-social/README.md rename to demo-social/README.md diff --git a/spring-boot-demo-social/pom.xml b/demo-social/pom.xml similarity index 94% rename from spring-boot-demo-social/pom.xml rename to demo-social/pom.xml index 241accefe..3b4a7b662 100644 --- a/spring-boot-demo-social/pom.xml +++ b/demo-social/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-social + demo-social 1.0.0-SNAPSHOT jar - spring-boot-demo-social + demo-social Demo project for Spring Boot @@ -71,7 +71,7 @@ - spring-boot-demo-social + demo-social org.springframework.boot diff --git a/spring-boot-demo-social/src/main/java/com/xkcoding/social/SpringBootDemoSocialApplication.java b/demo-social/src/main/java/com/xkcoding/social/SpringBootDemoSocialApplication.java similarity index 100% rename from spring-boot-demo-social/src/main/java/com/xkcoding/social/SpringBootDemoSocialApplication.java rename to demo-social/src/main/java/com/xkcoding/social/SpringBootDemoSocialApplication.java diff --git a/spring-boot-demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java b/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java similarity index 100% rename from spring-boot-demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java rename to demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java diff --git a/spring-boot-demo-social/src/main/resources/application.yml b/demo-social/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-social/src/main/resources/application.yml rename to demo-social/src/main/resources/application.yml diff --git a/spring-boot-demo-social/src/test/java/com/xkcoding/social/SpringBootDemoSocialApplicationTests.java b/demo-social/src/test/java/com/xkcoding/social/SpringBootDemoSocialApplicationTests.java similarity index 100% rename from spring-boot-demo-social/src/test/java/com/xkcoding/social/SpringBootDemoSocialApplicationTests.java rename to demo-social/src/test/java/com/xkcoding/social/SpringBootDemoSocialApplicationTests.java diff --git a/spring-boot-demo-swagger-beauty/.gitignore b/demo-swagger-beauty/.gitignore similarity index 100% rename from spring-boot-demo-swagger-beauty/.gitignore rename to demo-swagger-beauty/.gitignore diff --git a/spring-boot-demo-swagger-beauty/README.md b/demo-swagger-beauty/README.md similarity index 100% rename from spring-boot-demo-swagger-beauty/README.md rename to demo-swagger-beauty/README.md diff --git a/spring-boot-demo-swagger-beauty/pom.xml b/demo-swagger-beauty/pom.xml similarity index 91% rename from spring-boot-demo-swagger-beauty/pom.xml rename to demo-swagger-beauty/pom.xml index 947d64d54..80704d2d1 100644 --- a/spring-boot-demo-swagger-beauty/pom.xml +++ b/demo-swagger-beauty/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-swagger-beauty + demo-swagger-beauty 1.0.0-SNAPSHOT jar - spring-boot-demo-swagger-beauty + demo-swagger-beauty Demo project for Spring Boot @@ -49,7 +49,7 @@ - spring-boot-demo-swagger-beauty + demo-swagger-beauty org.springframework.boot diff --git a/spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java similarity index 100% rename from spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java rename to demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java diff --git a/spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java similarity index 100% rename from spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java rename to demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java diff --git a/spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java similarity index 100% rename from spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java rename to demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java diff --git a/spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java similarity index 100% rename from spring-boot-demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java rename to demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java diff --git a/spring-boot-demo-swagger-beauty/src/main/resources/application.yml b/demo-swagger-beauty/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-swagger-beauty/src/main/resources/application.yml rename to demo-swagger-beauty/src/main/resources/application.yml diff --git a/spring-boot-demo-swagger-beauty/src/test/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplicationTests.java b/demo-swagger-beauty/src/test/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplicationTests.java similarity index 100% rename from spring-boot-demo-swagger-beauty/src/test/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplicationTests.java rename to demo-swagger-beauty/src/test/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplicationTests.java diff --git a/spring-boot-demo-swagger/.gitignore b/demo-swagger/.gitignore similarity index 100% rename from spring-boot-demo-swagger/.gitignore rename to demo-swagger/.gitignore diff --git a/spring-boot-demo-swagger/README.md b/demo-swagger/README.md similarity index 100% rename from spring-boot-demo-swagger/README.md rename to demo-swagger/README.md diff --git a/spring-boot-demo-swagger/pom.xml b/demo-swagger/pom.xml similarity index 93% rename from spring-boot-demo-swagger/pom.xml rename to demo-swagger/pom.xml index 525313d35..69e21d8de 100644 --- a/spring-boot-demo-swagger/pom.xml +++ b/demo-swagger/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-swagger + demo-swagger 1.0.0-SNAPSHOT jar - spring-boot-demo-swagger + demo-swagger Demo project for Spring Boot @@ -55,7 +55,7 @@ - spring-boot-demo-swagger + demo-swagger org.springframework.boot diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java b/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java diff --git a/spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java b/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java similarity index 100% rename from spring-boot-demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java rename to demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java diff --git a/spring-boot-demo-swagger/src/main/resources/application.yml b/demo-swagger/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-swagger/src/main/resources/application.yml rename to demo-swagger/src/main/resources/application.yml diff --git a/spring-boot-demo-swagger/src/test/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplicationTests.java b/demo-swagger/src/test/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplicationTests.java similarity index 100% rename from spring-boot-demo-swagger/src/test/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplicationTests.java rename to demo-swagger/src/test/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplicationTests.java diff --git a/spring-boot-demo-task-quartz/.gitignore b/demo-task-quartz/.gitignore similarity index 100% rename from spring-boot-demo-task-quartz/.gitignore rename to demo-task-quartz/.gitignore diff --git a/spring-boot-demo-task-quartz/README.md b/demo-task-quartz/README.md similarity index 100% rename from spring-boot-demo-task-quartz/README.md rename to demo-task-quartz/README.md diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_cloudscape.sql b/demo-task-quartz/init/dbTables/tables_cloudscape.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_cloudscape.sql rename to demo-task-quartz/init/dbTables/tables_cloudscape.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_cubrid.sql b/demo-task-quartz/init/dbTables/tables_cubrid.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_cubrid.sql rename to demo-task-quartz/init/dbTables/tables_cubrid.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_db2.sql b/demo-task-quartz/init/dbTables/tables_db2.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_db2.sql rename to demo-task-quartz/init/dbTables/tables_db2.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_db2_v72.sql b/demo-task-quartz/init/dbTables/tables_db2_v72.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_db2_v72.sql rename to demo-task-quartz/init/dbTables/tables_db2_v72.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_db2_v8.sql b/demo-task-quartz/init/dbTables/tables_db2_v8.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_db2_v8.sql rename to demo-task-quartz/init/dbTables/tables_db2_v8.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_db2_v95.sql b/demo-task-quartz/init/dbTables/tables_db2_v95.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_db2_v95.sql rename to demo-task-quartz/init/dbTables/tables_db2_v95.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_derby.sql b/demo-task-quartz/init/dbTables/tables_derby.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_derby.sql rename to demo-task-quartz/init/dbTables/tables_derby.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_derby_previous.sql b/demo-task-quartz/init/dbTables/tables_derby_previous.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_derby_previous.sql rename to demo-task-quartz/init/dbTables/tables_derby_previous.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_firebird.sql b/demo-task-quartz/init/dbTables/tables_firebird.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_firebird.sql rename to demo-task-quartz/init/dbTables/tables_firebird.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_h2.sql b/demo-task-quartz/init/dbTables/tables_h2.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_h2.sql rename to demo-task-quartz/init/dbTables/tables_h2.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_hsqldb.sql b/demo-task-quartz/init/dbTables/tables_hsqldb.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_hsqldb.sql rename to demo-task-quartz/init/dbTables/tables_hsqldb.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_hsqldb_old.sql b/demo-task-quartz/init/dbTables/tables_hsqldb_old.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_hsqldb_old.sql rename to demo-task-quartz/init/dbTables/tables_hsqldb_old.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_informix.sql b/demo-task-quartz/init/dbTables/tables_informix.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_informix.sql rename to demo-task-quartz/init/dbTables/tables_informix.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_mysql.sql b/demo-task-quartz/init/dbTables/tables_mysql.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_mysql.sql rename to demo-task-quartz/init/dbTables/tables_mysql.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_mysql_innodb.sql b/demo-task-quartz/init/dbTables/tables_mysql_innodb.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_mysql_innodb.sql rename to demo-task-quartz/init/dbTables/tables_mysql_innodb.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_oracle.sql b/demo-task-quartz/init/dbTables/tables_oracle.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_oracle.sql rename to demo-task-quartz/init/dbTables/tables_oracle.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_pointbase.sql b/demo-task-quartz/init/dbTables/tables_pointbase.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_pointbase.sql rename to demo-task-quartz/init/dbTables/tables_pointbase.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_postgres.sql b/demo-task-quartz/init/dbTables/tables_postgres.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_postgres.sql rename to demo-task-quartz/init/dbTables/tables_postgres.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_sapdb.sql b/demo-task-quartz/init/dbTables/tables_sapdb.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_sapdb.sql rename to demo-task-quartz/init/dbTables/tables_sapdb.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_solid.sql b/demo-task-quartz/init/dbTables/tables_solid.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_solid.sql rename to demo-task-quartz/init/dbTables/tables_solid.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_sqlServer.sql b/demo-task-quartz/init/dbTables/tables_sqlServer.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_sqlServer.sql rename to demo-task-quartz/init/dbTables/tables_sqlServer.sql diff --git a/spring-boot-demo-task-quartz/init/dbTables/tables_sybase.sql b/demo-task-quartz/init/dbTables/tables_sybase.sql similarity index 100% rename from spring-boot-demo-task-quartz/init/dbTables/tables_sybase.sql rename to demo-task-quartz/init/dbTables/tables_sybase.sql diff --git a/spring-boot-demo-task-quartz/pom.xml b/demo-task-quartz/pom.xml similarity index 94% rename from spring-boot-demo-task-quartz/pom.xml rename to demo-task-quartz/pom.xml index 9fab559b5..51a66c99d 100644 --- a/spring-boot-demo-task-quartz/pom.xml +++ b/demo-task-quartz/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-task-quartz + demo-task-quartz 1.0.0-SNAPSHOT jar - spring-boot-demo-task-quartz + demo-task-quartz Demo project for Spring Boot @@ -76,7 +76,7 @@ - spring-boot-demo-task-quartz + demo-task-quartz org.springframework.boot diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java diff --git a/spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java similarity index 100% rename from spring-boot-demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java rename to demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java diff --git a/spring-boot-demo-task-quartz/src/main/resources/application.yml b/demo-task-quartz/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-task-quartz/src/main/resources/application.yml rename to demo-task-quartz/src/main/resources/application.yml diff --git a/spring-boot-demo-task-quartz/src/main/resources/mappers/JobMapper.xml b/demo-task-quartz/src/main/resources/mappers/JobMapper.xml similarity index 100% rename from spring-boot-demo-task-quartz/src/main/resources/mappers/JobMapper.xml rename to demo-task-quartz/src/main/resources/mappers/JobMapper.xml diff --git a/spring-boot-demo-task-quartz/src/main/resources/static/job.html b/demo-task-quartz/src/main/resources/static/job.html similarity index 100% rename from spring-boot-demo-task-quartz/src/main/resources/static/job.html rename to demo-task-quartz/src/main/resources/static/job.html diff --git a/spring-boot-demo-task-quartz/src/test/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplicationTests.java b/demo-task-quartz/src/test/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplicationTests.java similarity index 100% rename from spring-boot-demo-task-quartz/src/test/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplicationTests.java rename to demo-task-quartz/src/test/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplicationTests.java diff --git a/spring-boot-demo-task-xxl-job/.gitignore b/demo-task-xxl-job/.gitignore similarity index 100% rename from spring-boot-demo-task-xxl-job/.gitignore rename to demo-task-xxl-job/.gitignore diff --git a/spring-boot-demo-task-xxl-job/README.md b/demo-task-xxl-job/README.md similarity index 100% rename from spring-boot-demo-task-xxl-job/README.md rename to demo-task-xxl-job/README.md diff --git a/spring-boot-demo-task-xxl-job/pom.xml b/demo-task-xxl-job/pom.xml similarity index 93% rename from spring-boot-demo-task-xxl-job/pom.xml rename to demo-task-xxl-job/pom.xml index efa96568c..23dae7066 100644 --- a/spring-boot-demo-task-xxl-job/pom.xml +++ b/demo-task-xxl-job/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-task-xxl-job + demo-task-xxl-job 1.0.0-SNAPSHOT jar - spring-boot-demo-task-xxl-job + demo-task-xxl-job Demo project for Spring Boot @@ -66,7 +66,7 @@ - spring-boot-demo-task-xxl-job + demo-task-xxl-job org.springframework.boot diff --git a/spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/SpringBootDemoTaskXxlJobApplication.java b/demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/SpringBootDemoTaskXxlJobApplication.java similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/SpringBootDemoTaskXxlJobApplication.java rename to demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/SpringBootDemoTaskXxlJobApplication.java diff --git a/spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/XxlJobConfig.java b/demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/XxlJobConfig.java similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/XxlJobConfig.java rename to demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/XxlJobConfig.java diff --git a/spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/props/XxlJobProps.java b/demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/props/XxlJobProps.java similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/props/XxlJobProps.java rename to demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/config/props/XxlJobProps.java diff --git a/spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/controller/ManualOperateController.java b/demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/controller/ManualOperateController.java similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/controller/ManualOperateController.java rename to demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/controller/ManualOperateController.java diff --git a/spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/task/DemoTask.java b/demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/task/DemoTask.java similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/task/DemoTask.java rename to demo-task-xxl-job/src/main/java/com/xkcoding/task/xxl/job/task/DemoTask.java diff --git a/spring-boot-demo-task-xxl-job/src/main/resources/application.yml b/demo-task-xxl-job/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-task-xxl-job/src/main/resources/application.yml rename to demo-task-xxl-job/src/main/resources/application.yml diff --git a/spring-boot-demo-task/.gitignore b/demo-task/.gitignore similarity index 100% rename from spring-boot-demo-task/.gitignore rename to demo-task/.gitignore diff --git a/spring-boot-demo-task/README.md b/demo-task/README.md similarity index 100% rename from spring-boot-demo-task/README.md rename to demo-task/README.md diff --git a/spring-boot-demo-task/pom.xml b/demo-task/pom.xml similarity index 93% rename from spring-boot-demo-task/pom.xml rename to demo-task/pom.xml index 9405fc6fe..afae3c759 100644 --- a/spring-boot-demo-task/pom.xml +++ b/demo-task/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-task + demo-task 1.0.0-SNAPSHOT jar - spring-boot-demo-task + demo-task Demo project for Spring Boot @@ -52,7 +52,7 @@ - spring-boot-demo-task + demo-task org.springframework.boot diff --git a/spring-boot-demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java b/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java similarity index 100% rename from spring-boot-demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java rename to demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java diff --git a/spring-boot-demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java b/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java similarity index 100% rename from spring-boot-demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java rename to demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java diff --git a/spring-boot-demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java b/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java similarity index 100% rename from spring-boot-demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java rename to demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java diff --git a/spring-boot-demo-task/src/main/resources/application.yml b/demo-task/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-task/src/main/resources/application.yml rename to demo-task/src/main/resources/application.yml diff --git a/spring-boot-demo-task/src/test/java/com/xkcoding/task/SpringBootDemoTaskApplicationTests.java b/demo-task/src/test/java/com/xkcoding/task/SpringBootDemoTaskApplicationTests.java similarity index 100% rename from spring-boot-demo-task/src/test/java/com/xkcoding/task/SpringBootDemoTaskApplicationTests.java rename to demo-task/src/test/java/com/xkcoding/task/SpringBootDemoTaskApplicationTests.java diff --git a/spring-boot-demo-template-beetl/.gitignore b/demo-template-beetl/.gitignore similarity index 100% rename from spring-boot-demo-template-beetl/.gitignore rename to demo-template-beetl/.gitignore diff --git a/spring-boot-demo-template-beetl/README.md b/demo-template-beetl/README.md similarity index 100% rename from spring-boot-demo-template-beetl/README.md rename to demo-template-beetl/README.md diff --git a/spring-boot-demo-template-beetl/pom.xml b/demo-template-beetl/pom.xml similarity index 59% rename from spring-boot-demo-template-beetl/pom.xml rename to demo-template-beetl/pom.xml index 39324c09f..56c043fc3 100644 --- a/spring-boot-demo-template-beetl/pom.xml +++ b/demo-template-beetl/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-template-beetl - 1.0.0-SNAPSHOT - jar + demo-template-beetl + 1.0.0-SNAPSHOT + jar - spring-boot-demo-template-beetl - Demo project for Spring Boot + demo-template-beetl + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 1.1.63.RELEASE @@ -53,14 +53,14 @@ - - spring-boot-demo-template-beetl - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-template-beetl + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java similarity index 100% rename from spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java rename to demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java diff --git a/spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java similarity index 100% rename from spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java rename to demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java diff --git a/spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java similarity index 100% rename from spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java rename to demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java diff --git a/spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java similarity index 100% rename from spring-boot-demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java rename to demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java diff --git a/spring-boot-demo-template-beetl/src/main/resources/application.yml b/demo-template-beetl/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-template-beetl/src/main/resources/application.yml rename to demo-template-beetl/src/main/resources/application.yml diff --git a/spring-boot-demo-template-beetl/src/main/resources/templates/common/head.html b/demo-template-beetl/src/main/resources/templates/common/head.html similarity index 100% rename from spring-boot-demo-template-beetl/src/main/resources/templates/common/head.html rename to demo-template-beetl/src/main/resources/templates/common/head.html diff --git a/spring-boot-demo-template-beetl/src/main/resources/templates/page/index.btl b/demo-template-beetl/src/main/resources/templates/page/index.btl similarity index 100% rename from spring-boot-demo-template-beetl/src/main/resources/templates/page/index.btl rename to demo-template-beetl/src/main/resources/templates/page/index.btl diff --git a/spring-boot-demo-template-beetl/src/main/resources/templates/page/login.btl b/demo-template-beetl/src/main/resources/templates/page/login.btl similarity index 100% rename from spring-boot-demo-template-beetl/src/main/resources/templates/page/login.btl rename to demo-template-beetl/src/main/resources/templates/page/login.btl diff --git a/spring-boot-demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java b/demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java similarity index 100% rename from spring-boot-demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java rename to demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java diff --git a/spring-boot-demo-template-enjoy/.gitignore b/demo-template-enjoy/.gitignore similarity index 100% rename from spring-boot-demo-template-enjoy/.gitignore rename to demo-template-enjoy/.gitignore diff --git a/spring-boot-demo-template-enjoy/README.md b/demo-template-enjoy/README.md similarity index 100% rename from spring-boot-demo-template-enjoy/README.md rename to demo-template-enjoy/README.md diff --git a/spring-boot-demo-template-enjoy/pom.xml b/demo-template-enjoy/pom.xml similarity index 58% rename from spring-boot-demo-template-enjoy/pom.xml rename to demo-template-enjoy/pom.xml index 737160e7a..c21fe3f9e 100644 --- a/spring-boot-demo-template-enjoy/pom.xml +++ b/demo-template-enjoy/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-template-enjoy - 1.0.0-SNAPSHOT - jar + demo-template-enjoy + 1.0.0-SNAPSHOT + jar - spring-boot-demo-template-enjoy - Demo project for Spring Boot + demo-template-enjoy + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 3.5 @@ -53,14 +53,14 @@ - - spring-boot-demo-template-enjoy - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-template-enjoy + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java rename to demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java diff --git a/spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java rename to demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java diff --git a/spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java rename to demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java diff --git a/spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java rename to demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java diff --git a/spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java rename to demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java diff --git a/spring-boot-demo-template-enjoy/src/main/resources/application.yml b/demo-template-enjoy/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/resources/application.yml rename to demo-template-enjoy/src/main/resources/application.yml diff --git a/spring-boot-demo-template-enjoy/src/main/resources/templates/common/head.html b/demo-template-enjoy/src/main/resources/templates/common/head.html similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/resources/templates/common/head.html rename to demo-template-enjoy/src/main/resources/templates/common/head.html diff --git a/spring-boot-demo-template-enjoy/src/main/resources/templates/page/index.html b/demo-template-enjoy/src/main/resources/templates/page/index.html similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/resources/templates/page/index.html rename to demo-template-enjoy/src/main/resources/templates/page/index.html diff --git a/spring-boot-demo-template-enjoy/src/main/resources/templates/page/login.html b/demo-template-enjoy/src/main/resources/templates/page/login.html similarity index 100% rename from spring-boot-demo-template-enjoy/src/main/resources/templates/page/login.html rename to demo-template-enjoy/src/main/resources/templates/page/login.html diff --git a/spring-boot-demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java b/demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java similarity index 100% rename from spring-boot-demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java rename to demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java diff --git a/spring-boot-demo-template-freemarker/.gitignore b/demo-template-freemarker/.gitignore similarity index 100% rename from spring-boot-demo-template-freemarker/.gitignore rename to demo-template-freemarker/.gitignore diff --git a/spring-boot-demo-template-freemarker/README.md b/demo-template-freemarker/README.md similarity index 100% rename from spring-boot-demo-template-freemarker/README.md rename to demo-template-freemarker/README.md diff --git a/spring-boot-demo-template-freemarker/pom.xml b/demo-template-freemarker/pom.xml similarity index 57% rename from spring-boot-demo-template-freemarker/pom.xml rename to demo-template-freemarker/pom.xml index f72fb119a..0266366b0 100644 --- a/spring-boot-demo-template-freemarker/pom.xml +++ b/demo-template-freemarker/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-template-freemarker - 1.0.0-SNAPSHOT - jar + demo-template-freemarker + 1.0.0-SNAPSHOT + jar - spring-boot-demo-template-freemarker - Demo project for Spring Boot + demo-template-freemarker + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -51,14 +51,14 @@ - - spring-boot-demo-template-freemarker - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-template-freemarker + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java rename to demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java rename to demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java rename to demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java diff --git a/spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java rename to demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java diff --git a/spring-boot-demo-template-freemarker/src/main/resources/application.yml b/demo-template-freemarker/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/resources/application.yml rename to demo-template-freemarker/src/main/resources/application.yml diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/common/head.ftl b/demo-template-freemarker/src/main/resources/templates/common/head.ftl similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/resources/templates/common/head.ftl rename to demo-template-freemarker/src/main/resources/templates/common/head.ftl diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/page/index.ftl b/demo-template-freemarker/src/main/resources/templates/page/index.ftl similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/resources/templates/page/index.ftl rename to demo-template-freemarker/src/main/resources/templates/page/index.ftl diff --git a/spring-boot-demo-template-freemarker/src/main/resources/templates/page/login.ftl b/demo-template-freemarker/src/main/resources/templates/page/login.ftl similarity index 100% rename from spring-boot-demo-template-freemarker/src/main/resources/templates/page/login.ftl rename to demo-template-freemarker/src/main/resources/templates/page/login.ftl diff --git a/spring-boot-demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java b/demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java similarity index 100% rename from spring-boot-demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java rename to demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java diff --git a/spring-boot-demo-template-thymeleaf/.gitignore b/demo-template-thymeleaf/.gitignore similarity index 100% rename from spring-boot-demo-template-thymeleaf/.gitignore rename to demo-template-thymeleaf/.gitignore diff --git a/spring-boot-demo-template-thymeleaf/README.md b/demo-template-thymeleaf/README.md similarity index 100% rename from spring-boot-demo-template-thymeleaf/README.md rename to demo-template-thymeleaf/README.md diff --git a/spring-boot-demo-template-thymeleaf/pom.xml b/demo-template-thymeleaf/pom.xml similarity index 60% rename from spring-boot-demo-template-thymeleaf/pom.xml rename to demo-template-thymeleaf/pom.xml index 835611c22..544065fe5 100644 --- a/spring-boot-demo-template-thymeleaf/pom.xml +++ b/demo-template-thymeleaf/pom.xml @@ -1,23 +1,23 @@ - 4.0.0 + 4.0.0 - spring-boot-demo-template-thymeleaf - 1.0.0-SNAPSHOT - jar + demo-template-thymeleaf + 1.0.0-SNAPSHOT + jar - spring-boot-demo-template-thymeleaf - Demo project for Spring Boot + demo-template-thymeleaf + Demo project for Spring Boot - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + - - UTF-8 + + UTF-8 UTF-8 1.8 @@ -51,14 +51,14 @@ - - spring-boot-demo-template-thymeleaf - - - org.springframework.boot - spring-boot-maven-plugin - - - + + demo-template-thymeleaf + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java rename to demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java diff --git a/spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java rename to demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java diff --git a/spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java rename to demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java diff --git a/spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java rename to demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java diff --git a/spring-boot-demo-template-thymeleaf/src/main/resources/application.yml b/demo-template-thymeleaf/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/resources/application.yml rename to demo-template-thymeleaf/src/main/resources/application.yml diff --git a/spring-boot-demo-template-thymeleaf/src/main/resources/templates/common/head.html b/demo-template-thymeleaf/src/main/resources/templates/common/head.html similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/resources/templates/common/head.html rename to demo-template-thymeleaf/src/main/resources/templates/common/head.html diff --git a/spring-boot-demo-template-thymeleaf/src/main/resources/templates/page/index.html b/demo-template-thymeleaf/src/main/resources/templates/page/index.html similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/resources/templates/page/index.html rename to demo-template-thymeleaf/src/main/resources/templates/page/index.html diff --git a/spring-boot-demo-template-thymeleaf/src/main/resources/templates/page/login.html b/demo-template-thymeleaf/src/main/resources/templates/page/login.html similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/main/resources/templates/page/login.html rename to demo-template-thymeleaf/src/main/resources/templates/page/login.html diff --git a/spring-boot-demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java b/demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java similarity index 100% rename from spring-boot-demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java rename to demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java diff --git a/spring-boot-demo-tio/.gitignore b/demo-tio/.gitignore similarity index 100% rename from spring-boot-demo-tio/.gitignore rename to demo-tio/.gitignore diff --git a/spring-boot-demo-tio/README.md b/demo-tio/README.md similarity index 100% rename from spring-boot-demo-tio/README.md rename to demo-tio/README.md diff --git a/spring-boot-demo-tio/pom.xml b/demo-tio/pom.xml similarity index 93% rename from spring-boot-demo-tio/pom.xml rename to demo-tio/pom.xml index b5f4a9ec5..b3ec5b46d 100644 --- a/spring-boot-demo-tio/pom.xml +++ b/demo-tio/pom.xml @@ -7,9 +7,9 @@ spring-boot-demo 1.0.0-SNAPSHOT - spring-boot-demo-tio + demo-tio 1.0.0-SNAPSHOT - spring-boot-demo-tio + demo-tio Demo project for Spring Boot diff --git a/spring-boot-demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java b/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java similarity index 100% rename from spring-boot-demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java rename to demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java diff --git a/spring-boot-demo-tio/src/main/resources/application.properties b/demo-tio/src/main/resources/application.properties similarity index 100% rename from spring-boot-demo-tio/src/main/resources/application.properties rename to demo-tio/src/main/resources/application.properties diff --git a/spring-boot-demo-tio/src/test/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplicationTests.java b/demo-tio/src/test/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplicationTests.java similarity index 100% rename from spring-boot-demo-tio/src/test/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplicationTests.java rename to demo-tio/src/test/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplicationTests.java diff --git a/spring-boot-demo-uflo/.gitignore b/demo-uflo/.gitignore similarity index 100% rename from spring-boot-demo-uflo/.gitignore rename to demo-uflo/.gitignore diff --git a/spring-boot-demo-urule/pom.xml b/demo-uflo/pom.xml similarity index 90% rename from spring-boot-demo-urule/pom.xml rename to demo-uflo/pom.xml index 877f84c24..a87457a84 100644 --- a/spring-boot-demo-urule/pom.xml +++ b/demo-uflo/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-urule + demo-uflo 1.0.0-SNAPSHOT jar - spring-boot-demo-urule + demo-uflo Demo project for Spring Boot @@ -36,7 +36,7 @@ - spring-boot-demo-urule + demo-uflo org.springframework.boot diff --git a/spring-boot-demo-uflo/src/main/java/com/xkcoding/uflo/SpringBootDemoUfloApplication.java b/demo-uflo/src/main/java/com/xkcoding/uflo/SpringBootDemoUfloApplication.java similarity index 100% rename from spring-boot-demo-uflo/src/main/java/com/xkcoding/uflo/SpringBootDemoUfloApplication.java rename to demo-uflo/src/main/java/com/xkcoding/uflo/SpringBootDemoUfloApplication.java diff --git a/spring-boot-demo-uflo/src/main/resources/application.properties b/demo-uflo/src/main/resources/application.properties similarity index 100% rename from spring-boot-demo-uflo/src/main/resources/application.properties rename to demo-uflo/src/main/resources/application.properties diff --git a/spring-boot-demo-uflo/src/test/java/com/xkcoding/uflo/SpringBootDemoUfloApplicationTests.java b/demo-uflo/src/test/java/com/xkcoding/uflo/SpringBootDemoUfloApplicationTests.java similarity index 100% rename from spring-boot-demo-uflo/src/test/java/com/xkcoding/uflo/SpringBootDemoUfloApplicationTests.java rename to demo-uflo/src/test/java/com/xkcoding/uflo/SpringBootDemoUfloApplicationTests.java diff --git a/spring-boot-demo-upload/.gitignore b/demo-upload/.gitignore similarity index 100% rename from spring-boot-demo-upload/.gitignore rename to demo-upload/.gitignore diff --git a/spring-boot-demo-upload/README.md b/demo-upload/README.md similarity index 100% rename from spring-boot-demo-upload/README.md rename to demo-upload/README.md diff --git a/spring-boot-demo-upload/pom.xml b/demo-upload/pom.xml similarity index 93% rename from spring-boot-demo-upload/pom.xml rename to demo-upload/pom.xml index 8d9b5ec54..7f0792d32 100644 --- a/spring-boot-demo-upload/pom.xml +++ b/demo-upload/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-upload + demo-upload 1.0.0-SNAPSHOT jar - spring-boot-demo-upload + demo-upload Demo project for Spring Boot @@ -58,7 +58,7 @@ - spring-boot-demo-upload + demo-upload org.springframework.boot diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java b/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java rename to demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java rename to demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java rename to demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java rename to demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java rename to demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java diff --git a/spring-boot-demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java similarity index 100% rename from spring-boot-demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java rename to demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java diff --git a/spring-boot-demo-upload/src/main/resources/application.yml b/demo-upload/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-upload/src/main/resources/application.yml rename to demo-upload/src/main/resources/application.yml diff --git a/spring-boot-demo-upload/src/main/resources/templates/index.html b/demo-upload/src/main/resources/templates/index.html similarity index 100% rename from spring-boot-demo-upload/src/main/resources/templates/index.html rename to demo-upload/src/main/resources/templates/index.html diff --git a/spring-boot-demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java b/demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java similarity index 100% rename from spring-boot-demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java rename to demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java diff --git a/spring-boot-demo-ureport2/.gitignore b/demo-ureport2/.gitignore similarity index 100% rename from spring-boot-demo-ureport2/.gitignore rename to demo-ureport2/.gitignore diff --git a/spring-boot-demo-ureport2/pom.xml b/demo-ureport2/pom.xml similarity index 90% rename from spring-boot-demo-ureport2/pom.xml rename to demo-ureport2/pom.xml index a922faa61..2ed520cfc 100644 --- a/spring-boot-demo-ureport2/pom.xml +++ b/demo-ureport2/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-ureport2 + demo-ureport2 1.0.0-SNAPSHOT jar - spring-boot-demo-ureport2 + demo-ureport2 Demo project for Spring Boot @@ -36,7 +36,7 @@ - spring-boot-demo-ureport2 + demo-ureport2 org.springframework.boot diff --git a/spring-boot-demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java b/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java similarity index 100% rename from spring-boot-demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java rename to demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java diff --git a/spring-boot-demo-ureport2/src/main/resources/application.properties b/demo-ureport2/src/main/resources/application.properties similarity index 100% rename from spring-boot-demo-ureport2/src/main/resources/application.properties rename to demo-ureport2/src/main/resources/application.properties diff --git a/spring-boot-demo-ureport2/src/test/java/com/xkcoding/ureport2/SpringBootDemoUreport2ApplicationTests.java b/demo-ureport2/src/test/java/com/xkcoding/ureport2/SpringBootDemoUreport2ApplicationTests.java similarity index 100% rename from spring-boot-demo-ureport2/src/test/java/com/xkcoding/ureport2/SpringBootDemoUreport2ApplicationTests.java rename to demo-ureport2/src/test/java/com/xkcoding/ureport2/SpringBootDemoUreport2ApplicationTests.java diff --git a/spring-boot-demo-urule/.gitignore b/demo-urule/.gitignore similarity index 100% rename from spring-boot-demo-urule/.gitignore rename to demo-urule/.gitignore diff --git a/spring-boot-demo-mq-rocketmq/pom.xml b/demo-urule/pom.xml similarity index 89% rename from spring-boot-demo-mq-rocketmq/pom.xml rename to demo-urule/pom.xml index 8f18be46d..416b7b107 100644 --- a/spring-boot-demo-mq-rocketmq/pom.xml +++ b/demo-urule/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-mq-rocketmq + demo-urule 1.0.0-SNAPSHOT jar - spring-boot-demo-mq-rocketmq + demo-urule Demo project for Spring Boot @@ -36,7 +36,7 @@ - spring-boot-demo-mq-rocketmq + demo-urule org.springframework.boot diff --git a/spring-boot-demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java b/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java similarity index 100% rename from spring-boot-demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java rename to demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java diff --git a/spring-boot-demo-urule/src/main/resources/application.properties b/demo-urule/src/main/resources/application.properties similarity index 100% rename from spring-boot-demo-urule/src/main/resources/application.properties rename to demo-urule/src/main/resources/application.properties diff --git a/spring-boot-demo-urule/src/test/java/com/xkcoding/urule/SpringBootDemoUruleApplicationTests.java b/demo-urule/src/test/java/com/xkcoding/urule/SpringBootDemoUruleApplicationTests.java similarity index 100% rename from spring-boot-demo-urule/src/test/java/com/xkcoding/urule/SpringBootDemoUruleApplicationTests.java rename to demo-urule/src/test/java/com/xkcoding/urule/SpringBootDemoUruleApplicationTests.java diff --git a/spring-boot-demo-war/.gitignore b/demo-war/.gitignore similarity index 100% rename from spring-boot-demo-war/.gitignore rename to demo-war/.gitignore diff --git a/spring-boot-demo-war/README.md b/demo-war/README.md similarity index 100% rename from spring-boot-demo-war/README.md rename to demo-war/README.md diff --git a/spring-boot-demo-war/pom.xml b/demo-war/pom.xml similarity index 93% rename from spring-boot-demo-war/pom.xml rename to demo-war/pom.xml index be8ca17fd..e778242d2 100644 --- a/spring-boot-demo-war/pom.xml +++ b/demo-war/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-war + demo-war 1.0.0-SNAPSHOT war - spring-boot-demo-war + demo-war Demo project for Spring Boot @@ -44,7 +44,7 @@ - spring-boot-demo-war + demo-war org.springframework.boot diff --git a/spring-boot-demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java b/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java similarity index 100% rename from spring-boot-demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java rename to demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java diff --git a/spring-boot-demo-war/src/main/resources/application.yml b/demo-war/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-war/src/main/resources/application.yml rename to demo-war/src/main/resources/application.yml diff --git a/spring-boot-demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java b/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java similarity index 100% rename from spring-boot-demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java rename to demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java diff --git a/spring-boot-demo-websocket-socketio/.gitignore b/demo-websocket-socketio/.gitignore similarity index 100% rename from spring-boot-demo-websocket-socketio/.gitignore rename to demo-websocket-socketio/.gitignore diff --git a/spring-boot-demo-websocket-socketio/README.md b/demo-websocket-socketio/README.md similarity index 100% rename from spring-boot-demo-websocket-socketio/README.md rename to demo-websocket-socketio/README.md diff --git a/spring-boot-demo-websocket-socketio/pom.xml b/demo-websocket-socketio/pom.xml similarity index 92% rename from spring-boot-demo-websocket-socketio/pom.xml rename to demo-websocket-socketio/pom.xml index 31e5221de..28a4442ab 100644 --- a/spring-boot-demo-websocket-socketio/pom.xml +++ b/demo-websocket-socketio/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-websocket-socketio + demo-websocket-socketio 1.0.0-SNAPSHOT jar - spring-boot-demo-websocket-socketio + demo-websocket-socketio Demo project for Spring Boot @@ -60,7 +60,7 @@ - spring-boot-demo-websocket-socketio + demo-websocket-socketio org.springframework.boot diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java diff --git a/spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java rename to demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/application.yml b/demo-websocket-socketio/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/application.yml rename to demo-websocket-socketio/src/main/resources/application.yml diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/static/bootstrap.css b/demo-websocket-socketio/src/main/resources/static/bootstrap.css similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/static/bootstrap.css rename to demo-websocket-socketio/src/main/resources/static/bootstrap.css diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/static/index.html b/demo-websocket-socketio/src/main/resources/static/index.html similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/static/index.html rename to demo-websocket-socketio/src/main/resources/static/index.html diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/static/js/jquery-1.10.1.min.js b/demo-websocket-socketio/src/main/resources/static/js/jquery-1.10.1.min.js similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/static/js/jquery-1.10.1.min.js rename to demo-websocket-socketio/src/main/resources/static/js/jquery-1.10.1.min.js diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/static/js/moment.min.js b/demo-websocket-socketio/src/main/resources/static/js/moment.min.js similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/static/js/moment.min.js rename to demo-websocket-socketio/src/main/resources/static/js/moment.min.js diff --git a/spring-boot-demo-websocket-socketio/src/main/resources/static/js/socket.io/socket.io.js b/demo-websocket-socketio/src/main/resources/static/js/socket.io/socket.io.js similarity index 100% rename from spring-boot-demo-websocket-socketio/src/main/resources/static/js/socket.io/socket.io.js rename to demo-websocket-socketio/src/main/resources/static/js/socket.io/socket.io.js diff --git a/spring-boot-demo-websocket-socketio/src/test/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplicationTests.java b/demo-websocket-socketio/src/test/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplicationTests.java similarity index 100% rename from spring-boot-demo-websocket-socketio/src/test/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplicationTests.java rename to demo-websocket-socketio/src/test/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplicationTests.java diff --git a/spring-boot-demo-websocket/.gitignore b/demo-websocket/.gitignore similarity index 100% rename from spring-boot-demo-websocket/.gitignore rename to demo-websocket/.gitignore diff --git a/spring-boot-demo-websocket/README.md b/demo-websocket/README.md similarity index 100% rename from spring-boot-demo-websocket/README.md rename to demo-websocket/README.md diff --git a/spring-boot-demo-websocket/pom.xml b/demo-websocket/pom.xml similarity index 93% rename from spring-boot-demo-websocket/pom.xml rename to demo-websocket/pom.xml index 6a6babee0..6811ec167 100644 --- a/spring-boot-demo-websocket/pom.xml +++ b/demo-websocket/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-websocket + demo-websocket 1.0.0-SNAPSHOT - spring-boot-demo-websocket + demo-websocket Demo project for Spring Boot @@ -63,7 +63,7 @@ - spring-boot-demo-websocket + demo-websocket org.springframework.boot diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java b/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java b/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java b/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java b/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java diff --git a/spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java similarity index 100% rename from spring-boot-demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java rename to demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java diff --git a/spring-boot-demo-websocket/src/main/resources/application.yml b/demo-websocket/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-websocket/src/main/resources/application.yml rename to demo-websocket/src/main/resources/application.yml diff --git a/spring-boot-demo-websocket/src/main/resources/static/js/sockjs.min.js b/demo-websocket/src/main/resources/static/js/sockjs.min.js similarity index 100% rename from spring-boot-demo-websocket/src/main/resources/static/js/sockjs.min.js rename to demo-websocket/src/main/resources/static/js/sockjs.min.js diff --git a/spring-boot-demo-websocket/src/main/resources/static/js/stomp.js b/demo-websocket/src/main/resources/static/js/stomp.js similarity index 100% rename from spring-boot-demo-websocket/src/main/resources/static/js/stomp.js rename to demo-websocket/src/main/resources/static/js/stomp.js diff --git a/spring-boot-demo-websocket/src/main/resources/static/server.html b/demo-websocket/src/main/resources/static/server.html similarity index 100% rename from spring-boot-demo-websocket/src/main/resources/static/server.html rename to demo-websocket/src/main/resources/static/server.html diff --git a/spring-boot-demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java b/demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java similarity index 100% rename from spring-boot-demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java rename to demo-websocket/src/test/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplicationTests.java diff --git a/spring-boot-demo-zookeeper/.gitignore b/demo-zookeeper/.gitignore similarity index 100% rename from spring-boot-demo-zookeeper/.gitignore rename to demo-zookeeper/.gitignore diff --git a/spring-boot-demo-zookeeper/README.md b/demo-zookeeper/README.md similarity index 100% rename from spring-boot-demo-zookeeper/README.md rename to demo-zookeeper/README.md diff --git a/spring-boot-demo-zookeeper/pom.xml b/demo-zookeeper/pom.xml similarity index 93% rename from spring-boot-demo-zookeeper/pom.xml rename to demo-zookeeper/pom.xml index b3fdb9928..a22a8cb16 100644 --- a/spring-boot-demo-zookeeper/pom.xml +++ b/demo-zookeeper/pom.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-boot-demo-zookeeper + demo-zookeeper 1.0.0-SNAPSHOT jar - spring-boot-demo-zookeeper + demo-zookeeper Demo project for Spring Boot @@ -66,7 +66,7 @@ - spring-boot-demo-zookeeper + demo-zookeeper org.springframework.boot @@ -75,4 +75,4 @@ - \ No newline at end of file + diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java diff --git a/spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java similarity index 100% rename from spring-boot-demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java rename to demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java diff --git a/spring-boot-demo-zookeeper/src/main/resources/application.yml b/demo-zookeeper/src/main/resources/application.yml similarity index 100% rename from spring-boot-demo-zookeeper/src/main/resources/application.yml rename to demo-zookeeper/src/main/resources/application.yml diff --git a/spring-boot-demo-zookeeper/src/test/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplicationTests.java b/demo-zookeeper/src/test/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplicationTests.java similarity index 100% rename from spring-boot-demo-zookeeper/src/test/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplicationTests.java rename to demo-zookeeper/src/test/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplicationTests.java diff --git a/pom.xml b/pom.xml index 587e773e9..93b760b5e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,67 +8,67 @@ spring-boot-demo 1.0.0-SNAPSHOT - spring-boot-demo-helloworld - spring-boot-demo-properties - spring-boot-demo-actuator - spring-boot-demo-admin - spring-boot-demo-logback - spring-boot-demo-log-aop - spring-boot-demo-exception-handler - spring-boot-demo-template-freemarker - spring-boot-demo-template-thymeleaf - spring-boot-demo-template-beetl - spring-boot-demo-template-enjoy - spring-boot-demo-orm-jdbctemplate - spring-boot-demo-orm-jpa - spring-boot-demo-orm-mybatis - spring-boot-demo-orm-mybatis-mapper-page - spring-boot-demo-orm-mybatis-plus - spring-boot-demo-orm-beetlsql - spring-boot-demo-upload - spring-boot-demo-cache-redis - spring-boot-demo-cache-ehcache - spring-boot-demo-email - spring-boot-demo-task - spring-boot-demo-task-quartz - spring-boot-demo-task-xxl-job - spring-boot-demo-swagger - spring-boot-demo-swagger-beauty - spring-boot-demo-rbac-security - spring-boot-demo-rbac-shiro - spring-boot-demo-session - spring-boot-demo-oauth - spring-boot-demo-social - spring-boot-demo-zookeeper - spring-boot-demo-mq-rabbitmq - spring-boot-demo-mq-rocketmq - spring-boot-demo-mq-kafka - spring-boot-demo-websocket - spring-boot-demo-websocket-socketio - spring-boot-demo-ureport2 - spring-boot-demo-uflo - spring-boot-demo-urule - spring-boot-demo-activiti - spring-boot-demo-async - spring-boot-demo-dubbo - spring-boot-demo-war - spring-boot-demo-elasticsearch - spring-boot-demo-mongodb - spring-boot-demo-neo4j - spring-boot-demo-docker - spring-boot-demo-multi-datasource-jpa - spring-boot-demo-multi-datasource-mybatis - spring-boot-demo-sharding-jdbc - spring-boot-demo-tio - spring-boot-demo-codegen - spring-boot-demo-graylog - spring-boot-demo-ldap - spring-boot-demo-dynamic-datasource - spring-boot-demo-ratelimit-guava - spring-boot-demo-ratelimit-redis - spring-boot-demo-elasticsearch-rest-high-level-client - spring-boot-demo-https - spring-boot-demo-flyway + demo-helloworld + demo-properties + demo-actuator + demo-admin + demo-logback + demo-log-aop + demo-exception-handler + demo-template-freemarker + demo-template-thymeleaf + demo-template-beetl + demo-template-enjoy + demo-orm-jdbctemplate + demo-orm-jpa + demo-orm-mybatis + demo-orm-mybatis-mapper-page + demo-orm-mybatis-plus + demo-orm-beetlsql + demo-upload + demo-cache-redis + demo-cache-ehcache + demo-email + demo-task + demo-task-quartz + demo-task-xxl-job + demo-swagger + demo-swagger-beauty + demo-rbac-security + demo-rbac-shiro + demo-session + demo-oauth + demo-social + demo-zookeeper + demo-mq-rabbitmq + demo-mq-rocketmq + demo-mq-kafka + demo-websocket + demo-websocket-socketio + demo-ureport2 + demo-uflo + demo-urule + demo-activiti + demo-async + demo-dubbo + demo-war + demo-elasticsearch + demo-mongodb + demo-neo4j + demo-docker + demo-multi-datasource-jpa + demo-multi-datasource-mybatis + demo-sharding-jdbc + demo-tio + demo-codegen + demo-graylog + demo-ldap + demo-dynamic-datasource + demo-ratelimit-guava + demo-ratelimit-redis + demo-elasticsearch-rest-high-level-client + demo-https + demo-flyway pom diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/pom.xml b/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/pom.xml deleted file mode 100644 index 205b0c6c3..000000000 --- a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-consumer/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - spring-boot-demo-dubbo - com.xkcoding - 1.0.0-SNAPSHOT - - 4.0.0 - - spring-boot-demo-dubbo-consumer - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - com.alibaba.spring.boot - dubbo-spring-boot-starter - ${dubbo.starter.version} - - - - ${project.groupId} - spring-boot-demo-dubbo-common - ${project.version} - - - - com.101tec - zkclient - ${zkclient.version} - - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - spring-boot-demo-dubbo-consumer - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/pom.xml b/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/pom.xml deleted file mode 100644 index 5be2bccb2..000000000 --- a/spring-boot-demo-dubbo/spring-boot-demo-dubbo-provider/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - spring-boot-demo-dubbo - com.xkcoding - 1.0.0-SNAPSHOT - - 4.0.0 - - spring-boot-demo-dubbo-provider - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - com.alibaba.spring.boot - dubbo-spring-boot-starter - ${dubbo.starter.version} - - - - ${project.groupId} - spring-boot-demo-dubbo-common - ${project.version} - - - - com.101tec - zkclient - ${zkclient.version} - - - - org.projectlombok - lombok - true - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - spring-boot-demo-dubbo-provider - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-boot-demo-helloworld/pom.xml b/spring-boot-demo-helloworld/pom.xml deleted file mode 100644 index aef8a55bc..000000000 --- a/spring-boot-demo-helloworld/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - spring-boot-demo-helloworld - 1.0.0-SNAPSHOT - jar - - spring-boot-demo-helloworld - Demo project for Spring Boot - - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - cn.hutool - hutool-all - - - - - spring-boot-demo-helloworld - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/spring-boot-demo-logback/pom.xml b/spring-boot-demo-logback/pom.xml deleted file mode 100644 index 05a187f87..000000000 --- a/spring-boot-demo-logback/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - spring-boot-demo-logback - 1.0.0-SNAPSHOT - jar - - spring-boot-demo-logback - Demo project for Spring Boot - - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.projectlombok - lombok - true - - - - - spring-boot-demo-logback - - - org.springframework.boot - spring-boot-maven-plugin - - - - - From ca87bd08603e0466fb4af277cd2444f451ec5403 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 19 Oct 2020 18:23:13 +0800 Subject: [PATCH 02/16] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20TODO.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.en.md | 132 ++++++++++++++++++++++++++--------------------------- TODO.md | 132 ++++++++++++++++++++++++++--------------------------- 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/TODO.en.md b/TODO.en.md index bc9341610..a2c0ad8dd 100644 --- a/TODO.en.md +++ b/TODO.en.md @@ -2,72 +2,72 @@ ## Module plan (completed: 54 / 66) -- [x] ~~spring-boot-demo-helloworld(helloworld example)~~ -- [x] ~~spring-boot-demo-properties (read configuration file information)~~ -- [x] ~~spring-boot-demo-actuator (endpoint monitoring for Spring boot)~~ -- [x] ~~spring-boot-demo-admin-client (for Spring boot visual control client)~~ -- [x] ~~spring-boot-demo-admin-server (for Spring boot visual control server)~~ -- [x] ~~spring-boot-demo-logback (integrated logback log)~~ -- [x] ~~spring-boot-demo-log-aop (use AOP to intercept request log information)~~ -- [x] ~~spring-boot-demo-exception-handler (unified exception handling)~~ -- [x] ~~spring-boot-demo-template-freemarker (using template engine - Freemarker)~~ -- [x] ~~spring-boot-demo-template-thymeleaf (using template engine - thymeleaf)~~ -- [x] ~~spring-boot-demo-template-beetl (using template engine - beetl)~~ -- [x] ~~spring-boot-demo-template-enjoy (using template engine - JFinal-Enjoy)~~ -- [x] ~~spring-boot-demo-upload (upload - integrated local upload and seven cattle cloud upload)~~ -- [x] ~~spring-boot-demo-orm-jdbctemplate (operating SQL relational database - JdbcTemplate)~~ -- [x] ~~spring-boot-demo-orm-jpa (operating SQL Relational Database - JPA)~~ -- [x] ~~spring-boot-demo-orm-mybatis (operating SQL relational database - mybatis)~~ -- [x] ~~spring-boot-demo-orm-mybatis-mapper-page (operating SQL relational database - integrating mybatis generic Mapper, PageHelper)~~ -- [x] ~~spring-boot-demo-orm-mybatis-plus (operating SQL relational database - integrating mybatis-plus, Mapper, ActiveRecord)~~ -- [x] ~~spring-boot-demo-orm-beetlsql (operating SQL relational database - beetlSQL)~~ -- [x] ~~spring-boot-demo-cache-redis (using redis for caching)~~ -- [x] ~~spring-boot-demo-cache-ehcache (using Ehcache for caching)~~ -- [x] ~~spring-boot-demo-email (integrated mail service)~~ -- [x] ~~spring-boot-demo-task (scheduled task - Task implementation)~~ -- [x] ~~spring-boot-demo-task-quartz (scheduled task - Quartz implementation)~~ -- [x] ~~spring-boot-demo-task-xxl-job (scheduled task - XXL-JOB for Distributed Scheduling)~~ -- [x] ~~spring-boot-demo-swagger (integrated Swagger for API interface test management)~~ -- [x] ~~spring-boot-demo-swagger-beauty (integrated custom and more beautiful Swagger test management of API interface)~~ -- [x] ~~spring-boot-demo-rbac-security (implementing RBAC-based permission model - Spring Security)~~ -- [ ] spring-boot-demo-rbac-shiro (implementing RBAC-based permission model - shiro) -- [x] ~~spring-boot-demo-session(unified Session Management)~~ -- [ ] spring-boot-demo-oauth (OAuth2 certification) -- [x] ~~spring-boot-demo-social (integrated JustAuth implements third-party authorization verification, and implements third-party logins such as QQ, WeChat, GitHub, Google, Xiaomi, etc.)~~ -- [x] ~~spring-boot-demo-zookeeper (use zookeeper to implement distributed locks with AOP)~~ -- [x] ~~spring-boot-demo-mq-rabbitmq (integrated messaging middleware - RabbitMQ)~~ -- [ ] spring-boot-demo-mq-rocketmq (integrated messaging middleware - RocketMQ) -- [x] ~~spring-boot-demo-mq-kafka (integrated message middleware - Kafka)~~ -- [x] ~~spring-boot-demo-websocket (integrated websocket service)~~ -- [x] ~~spring-boot-demo-websocket-socketio (integrated socketio implements websocket service)~~ -- [ ] spring-boot-demo-ureport2 (integrated ureport2 implements a custom complex Chinese-style reporting engine) -- [ ] spring-boot-demo-uflo (integrated uflo implementation process control engine) -- [ ] spring-boot-demo-urule (integrated urule implementation rules engine) -- [ ] spring-boot-demo-activiti (integrated of Activiti to implement process control engine) -- [x] ~~spring-boot-demo-async (Spring boot implements asynchronous calls)~~ -- [x] ~~spring-boot-demo-dubbo (integrated dubbo)~~ -- [x] ~~spring-boot-demo-war (packaged into a war package)~~ -- [x] ~~spring-boot-demo-elasticsearch (integrated ElasticSearch)~~ -- [x] ~~spring-boot-demo-mongodb (integrated MongoDb)~~ -- [x] ~~spring-boot-demo-neo4j (integrated neo4j graph database)~~ -- [x] ~~spring-boot-demo-docker (packaged into docker image)~~ -- [x] ~~spring-boot-demo-multi-datasource-jpa (integrated JPA multi data source)~~ -- [x] ~~spring-boot-demo-multi-datasource-mybatis (integrated with mybatis multi-data source)~~ -- [x] ~~spring-boot-demo-sharding-jdbc (integrated sharding-jdbc implementation sub-library table)~~ -- [ ] spring-boot-demo-tio (integrated t-io) -- [ ] spring-boot-demo-grpc (integrated grpc, configure tls/ssl) see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5) -- [x] ~~spring-boot-demo-codegen (integrated velocity auto-generated code)~~ -- [x] ~~spring-boot-demo-graylog (integrated gralog log management)~~ -- [ ] spring-boot-demo-sso (integrated single sign on) see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12) -- [x] ~~spring-boot-demo-ldap (integrated ldap)see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23)~~ -- [x] ~~spring-boot-demo-dynamic-datasource(add datasource dynamically, switch datasource dynamically)~~ -- [x] ~~spring-boot-demo-ratelimit-guava(use Guava RateLimiter to protect API by standalone rate limiting)~~ -- [x] ~~spring-boot-demo-ratelimit-redis(use Redis and Lua script implementation to protect API by distributed rate limiting)~~ -- [x] ~~spring-boot-demo-https(integrated HTTPS)~~ -- [x] ~~spring-boot-demo-elasticsearch-rest-high-level-client(integrated Elasticsearch 7.x version,use official Rest High Level Client to operate ES data)~~ -- [ ] spring-boot-demo-springbatch(data process) -- [ ] spring-boot-demo-security-justauth(use JustAuth to login GitHub,and use Spring-Security to manage login state) -- [x] ~~spring-boot-demo-flyway(integrated Flyway to initialize tables and data in database, Flyway also support the sql script version control)~~ +- [x] ~~demo-helloworld(helloworld example)~~ +- [x] ~~demo-properties (read configuration file information)~~ +- [x] ~~demo-actuator (endpoint monitoring for Spring boot)~~ +- [x] ~~demo-admin-client (for Spring boot visual control client)~~ +- [x] ~~demo-admin-server (for Spring boot visual control server)~~ +- [x] ~~demo-logback (integrated logback log)~~ +- [x] ~~demo-log-aop (use AOP to intercept request log information)~~ +- [x] ~~demo-exception-handler (unified exception handling)~~ +- [x] ~~demo-template-freemarker (using template engine - Freemarker)~~ +- [x] ~~demo-template-thymeleaf (using template engine - thymeleaf)~~ +- [x] ~~demo-template-beetl (using template engine - beetl)~~ +- [x] ~~demo-template-enjoy (using template engine - JFinal-Enjoy)~~ +- [x] ~~demo-upload (upload - integrated local upload and seven cattle cloud upload)~~ +- [x] ~~demo-orm-jdbctemplate (operating SQL relational database - JdbcTemplate)~~ +- [x] ~~demo-orm-jpa (operating SQL Relational Database - JPA)~~ +- [x] ~~demo-orm-mybatis (operating SQL relational database - mybatis)~~ +- [x] ~~demo-orm-mybatis-mapper-page (operating SQL relational database - integrating mybatis generic Mapper, PageHelper)~~ +- [x] ~~demo-orm-mybatis-plus (operating SQL relational database - integrating mybatis-plus, Mapper, ActiveRecord)~~ +- [x] ~~demo-orm-beetlsql (operating SQL relational database - beetlSQL)~~ +- [x] ~~demo-cache-redis (using redis for caching)~~ +- [x] ~~demo-cache-ehcache (using Ehcache for caching)~~ +- [x] ~~demo-email (integrated mail service)~~ +- [x] ~~demo-task (scheduled task - Task implementation)~~ +- [x] ~~demo-task-quartz (scheduled task - Quartz implementation)~~ +- [x] ~~demo-task-xxl-job (scheduled task - XXL-JOB for Distributed Scheduling)~~ +- [x] ~~demo-swagger (integrated Swagger for API interface test management)~~ +- [x] ~~demo-swagger-beauty (integrated custom and more beautiful Swagger test management of API interface)~~ +- [x] ~~demo-rbac-security (implementing RBAC-based permission model - Spring Security)~~ +- [ ] demo-rbac-shiro (implementing RBAC-based permission model - shiro) +- [x] ~~demo-session(unified Session Management)~~ +- [ ] demo-oauth (OAuth2 certification) +- [x] ~~demo-social (integrated JustAuth implements third-party authorization verification, and implements third-party logins such as QQ, WeChat, GitHub, Google, Xiaomi, etc.)~~ +- [x] ~~demo-zookeeper (use zookeeper to implement distributed locks with AOP)~~ +- [x] ~~demo-mq-rabbitmq (integrated messaging middleware - RabbitMQ)~~ +- [ ] demo-mq-rocketmq (integrated messaging middleware - RocketMQ) +- [x] ~~demo-mq-kafka (integrated message middleware - Kafka)~~ +- [x] ~~demo-websocket (integrated websocket service)~~ +- [x] ~~demo-websocket-socketio (integrated socketio implements websocket service)~~ +- [ ] demo-ureport2 (integrated ureport2 implements a custom complex Chinese-style reporting engine) +- [ ] demo-uflo (integrated uflo implementation process control engine) +- [ ] demo-urule (integrated urule implementation rules engine) +- [ ] demo-activiti (integrated of Activiti to implement process control engine) +- [x] ~~demo-async (Spring boot implements asynchronous calls)~~ +- [x] ~~demo-dubbo (integrated dubbo)~~ +- [x] ~~demo-war (packaged into a war package)~~ +- [x] ~~demo-elasticsearch (integrated ElasticSearch)~~ +- [x] ~~demo-mongodb (integrated MongoDb)~~ +- [x] ~~demo-neo4j (integrated neo4j graph database)~~ +- [x] ~~demo-docker (packaged into docker image)~~ +- [x] ~~demo-multi-datasource-jpa (integrated JPA multi data source)~~ +- [x] ~~demo-multi-datasource-mybatis (integrated with mybatis multi-data source)~~ +- [x] ~~demo-sharding-jdbc (integrated sharding-jdbc implementation sub-library table)~~ +- [ ] demo-tio (integrated t-io) +- [ ] demo-grpc (integrated grpc, configure tls/ssl) see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5) +- [x] ~~demo-codegen (integrated velocity auto-generated code)~~ +- [x] ~~demo-graylog (integrated gralog log management)~~ +- [ ] demo-sso (integrated single sign on) see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12) +- [x] ~~demo-ldap (integrated ldap)see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23)~~ +- [x] ~~demo-dynamic-datasource(add datasource dynamically, switch datasource dynamically)~~ +- [x] ~~demo-ratelimit-guava(use Guava RateLimiter to protect API by standalone rate limiting)~~ +- [x] ~~demo-ratelimit-redis(use Redis and Lua script implementation to protect API by distributed rate limiting)~~ +- [x] ~~demo-https(integrated HTTPS)~~ +- [x] ~~demo-elasticsearch-rest-high-level-client(integrated Elasticsearch 7.x version,use official Rest High Level Client to operate ES data)~~ +- [ ] demo-springbatch(data process) +- [ ] demo-security-justauth(use JustAuth to login GitHub,and use Spring-Security to manage login state) +- [x] ~~demo-flyway(integrated Flyway to initialize tables and data in database, Flyway also support the sql script version control)~~ ## Remarks diff --git a/TODO.md b/TODO.md index 9f907358b..ad64d2659 100644 --- a/TODO.md +++ b/TODO.md @@ -2,72 +2,72 @@ ## 模块计划(已完成:54 / 66) -- [x] ~~spring-boot-demo-helloworld(Helloworld 示例)~~ -- [x] ~~spring-boot-demo-properties(读取配置文件信息)~~ -- [x] ~~spring-boot-demo-actuator(对 Spring boot 的端点监控)~~ -- [x] ~~spring-boot-demo-admin-client(对 Spring boot 可视化管控 客户端)~~ -- [x] ~~spring-boot-demo-admin-server(对 Spring boot 可视化管控 服务端)~~ -- [x] ~~spring-boot-demo-logback(集成 logback 日志)~~ -- [x] ~~spring-boot-demo-log-aop(使用 AOP 拦截请求日志信息)~~ -- [x] ~~spring-boot-demo-exception-handler(统一异常处理)~~ -- [x] ~~spring-boot-demo-template-freemarker(使用模板引擎 - Freemarker)~~ -- [x] ~~spring-boot-demo-template-thymeleaf(使用模板引擎 - thymeleaf)~~ -- [x] ~~spring-boot-demo-template-beetl(使用模板引擎 - beetl)~~ -- [x] ~~spring-boot-demo-template-enjoy(使用模板引擎 - JFinal-Enjoy)~~ -- [x] ~~spring-boot-demo-upload(上传 - 集成本地上传和七牛云上传)~~ -- [x] ~~spring-boot-demo-orm-jdbctemplate(操作 SQL 关系型数据库 - JdbcTemplate)~~ -- [x] ~~spring-boot-demo-orm-jpa(操作 SQL 关系型数据库 - JPA)~~ -- [x] ~~spring-boot-demo-orm-mybatis(操作 SQL 关系型数据库 - mybatis)~~ -- [x] ~~spring-boot-demo-orm-mybatis-mapper-page(操作 SQL 关系型数据库 - 集成mybatis通用Mapper,PageHelper)~~ -- [x] ~~spring-boot-demo-orm-mybatis-plus(操作 SQL 关系型数据库 - 集成mybatis-plus,Mapper操作、ActiveRecord操作)~~ -- [x] ~~spring-boot-demo-orm-beetlsql(操作 SQL 关系型数据库 - beetlSQL)~~ -- [x] ~~spring-boot-demo-cache-redis(使用 redis 进行缓存)~~ -- [x] ~~spring-boot-demo-cache-ehcache(使用 Ehcache 进行缓存)~~ -- [x] ~~spring-boot-demo-email(集成邮件服务)~~ -- [x] ~~spring-boot-demo-task(定时任务 - Task 实现)~~ -- [x] ~~spring-boot-demo-task-quartz(定时任务 - Quartz 实现)~~ -- [x] ~~spring-boot-demo-task-xxl-job(定时任务 - XXL-JOB 实现分布式调度)~~ -- [x] ~~spring-boot-demo-swagger(集成 Swagger 对 API 接口进行测试管理)~~ -- [x] ~~spring-boot-demo-swagger-beauty(集成自定义且更加美观的 Swagger 对 API 接口进行测试管理)~~ -- [x] ~~spring-boot-demo-rbac-security(实现基于 RBAC 的权限模型 - Spring Security)~~ -- [ ] spring-boot-demo-rbac-shiro(实现基于 RBAC 的权限模型 - shiro) -- [x] ~~spring-boot-demo-session(统一 Session 管理)~~ -- [ ] spring-boot-demo-oauth(OAuth2 认证) -- [x] ~~spring-boot-demo-social(集成 JustAuth 实现第三方授权验证,实现 QQ、微信、GitHub、谷歌、小米等第三方登录)~~ -- [x] ~~spring-boot-demo-zookeeper(使用 zookeeper 结合AOP实现分布式锁)~~ -- [x] ~~spring-boot-demo-mq-rabbitmq(集成消息中间件 - RabbitMQ)~~ -- [ ] spring-boot-demo-mq-rocketmq(集成消息中间件 - RocketMQ) -- [x] ~~spring-boot-demo-mq-kafka(集成消息中间件 - Kafka)~~ -- [x] ~~spring-boot-demo-websocket(集成 websocket 服务)~~ -- [x] ~~spring-boot-demo-websocket-socketio(集成 socketio 实现 websocket 服务)~~ -- [ ] spring-boot-demo-ureport2 (集成 ureport2 实现自定义的复杂中国式报表引擎) -- [ ] spring-boot-demo-uflo(集成 uflo 实现流程控制引擎) -- [ ] spring-boot-demo-urule(集成 urule 实现规则引擎) -- [ ] spring-boot-demo-activiti(集成 Activiti 实现流程控制引擎) -- [x] ~~spring-boot-demo-async(Spring boot 实现异步调用)~~ -- [x] ~~spring-boot-demo-dubbo(集成 dubbo)~~ -- [x] ~~spring-boot-demo-war(打包成war包)~~ -- [x] ~~spring-boot-demo-elasticsearch(集成 ElasticSearch)~~ -- [x] ~~spring-boot-demo-mongodb(集成 MongoDb)~~ -- [x] ~~spring-boot-demo-neo4j(集成 neo4j 图数据库)~~ -- [x] ~~spring-boot-demo-docker(打包成 docker 镜像)~~ -- [x] ~~spring-boot-demo-multi-datasource-jpa(集成JPA多数据源)~~ -- [x] ~~spring-boot-demo-multi-datasource-mybatis(集成mybatis多数据源)~~ -- [x] ~~spring-boot-demo-sharding-jdbc(集成 sharding-jdbc 实现分库分表)~~ -- [ ] spring-boot-demo-tio(集成 tio) -- [ ] spring-boot-demo-grpc(集成grpc,配置tls/ssl)参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5) -- [x] ~~spring-boot-demo-codegen(集成 velocity 自动生成代码)~~ -- [x] ~~spring-boot-demo-graylog(集成 gralog 日志管理)~~ -- [ ] spring-boot-demo-sso(集成单点登录)参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12) -- [x] ~~spring-boot-demo-ldap (集成 ldap)参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23)~~ -- [x] ~~spring-boot-demo-dynamic-datasource(动态添加数据源,切换数据源)~~ -- [x] ~~spring-boot-demo-ratelimit-guava(单机限流保护API,集成 Guava 的 RateLimiter)~~ -- [x] ~~spring-boot-demo-ratelimit-redis(分布式限流保护API,使用 Redis + lua 脚本实现)~~ -- [x] ~~spring-boot-demo-https(集成 HTTPS)~~ -- [x] ~~spring-boot-demo-elasticsearch-rest-high-level-client(集成 Elasticsearch 7.x 版本,使用官方 rest high level client操作 ES 数据)~~ -- [ ] spring-boot-demo-springbatch(数据处理) -- [ ] spring-boot-demo-security-justauth(使用 JustAuth 登录 GitHub,使用 Security 管理登录状态) -- [x] ~~spring-boot-demo-flyway(集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制)~~ +- [x] ~~demo-helloworld(Helloworld 示例)~~ +- [x] ~~demo-properties(读取配置文件信息)~~ +- [x] ~~demo-actuator(对 Spring boot 的端点监控)~~ +- [x] ~~demo-admin-client(对 Spring boot 可视化管控 客户端)~~ +- [x] ~~demo-admin-server(对 Spring boot 可视化管控 服务端)~~ +- [x] ~~demo-logback(集成 logback 日志)~~ +- [x] ~~demo-log-aop(使用 AOP 拦截请求日志信息)~~ +- [x] ~~demo-exception-handler(统一异常处理)~~ +- [x] ~~demo-template-freemarker(使用模板引擎 - Freemarker)~~ +- [x] ~~demo-template-thymeleaf(使用模板引擎 - thymeleaf)~~ +- [x] ~~demo-template-beetl(使用模板引擎 - beetl)~~ +- [x] ~~demo-template-enjoy(使用模板引擎 - JFinal-Enjoy)~~ +- [x] ~~demo-upload(上传 - 集成本地上传和七牛云上传)~~ +- [x] ~~demo-orm-jdbctemplate(操作 SQL 关系型数据库 - JdbcTemplate)~~ +- [x] ~~demo-orm-jpa(操作 SQL 关系型数据库 - JPA)~~ +- [x] ~~demo-orm-mybatis(操作 SQL 关系型数据库 - mybatis)~~ +- [x] ~~demo-orm-mybatis-mapper-page(操作 SQL 关系型数据库 - 集成mybatis通用Mapper,PageHelper)~~ +- [x] ~~demo-orm-mybatis-plus(操作 SQL 关系型数据库 - 集成mybatis-plus,Mapper操作、ActiveRecord操作)~~ +- [x] ~~demo-orm-beetlsql(操作 SQL 关系型数据库 - beetlSQL)~~ +- [x] ~~demo-cache-redis(使用 redis 进行缓存)~~ +- [x] ~~demo-cache-ehcache(使用 Ehcache 进行缓存)~~ +- [x] ~~demo-email(集成邮件服务)~~ +- [x] ~~demo-task(定时任务 - Task 实现)~~ +- [x] ~~demo-task-quartz(定时任务 - Quartz 实现)~~ +- [x] ~~demo-task-xxl-job(定时任务 - XXL-JOB 实现分布式调度)~~ +- [x] ~~demo-swagger(集成 Swagger 对 API 接口进行测试管理)~~ +- [x] ~~demo-swagger-beauty(集成自定义且更加美观的 Swagger 对 API 接口进行测试管理)~~ +- [x] ~~demo-rbac-security(实现基于 RBAC 的权限模型 - Spring Security)~~ +- [ ] demo-rbac-shiro(实现基于 RBAC 的权限模型 - shiro) +- [x] ~~demo-session(统一 Session 管理)~~ +- [ ] demo-oauth(OAuth2 认证) +- [x] ~~demo-social(集成 JustAuth 实现第三方授权验证,实现 QQ、微信、GitHub、谷歌、小米等第三方登录)~~ +- [x] ~~demo-zookeeper(使用 zookeeper 结合AOP实现分布式锁)~~ +- [x] ~~demo-mq-rabbitmq(集成消息中间件 - RabbitMQ)~~ +- [ ] demo-mq-rocketmq(集成消息中间件 - RocketMQ) +- [x] ~~demo-mq-kafka(集成消息中间件 - Kafka)~~ +- [x] ~~demo-websocket(集成 websocket 服务)~~ +- [x] ~~demo-websocket-socketio(集成 socketio 实现 websocket 服务)~~ +- [ ] demo-ureport2 (集成 ureport2 实现自定义的复杂中国式报表引擎) +- [ ] demo-uflo(集成 uflo 实现流程控制引擎) +- [ ] demo-urule(集成 urule 实现规则引擎) +- [ ] demo-activiti(集成 Activiti 实现流程控制引擎) +- [x] ~~demo-async(Spring boot 实现异步调用)~~ +- [x] ~~demo-dubbo(集成 dubbo)~~ +- [x] ~~demo-war(打包成war包)~~ +- [x] ~~demo-elasticsearch(集成 ElasticSearch)~~ +- [x] ~~demo-mongodb(集成 MongoDb)~~ +- [x] ~~demo-neo4j(集成 neo4j 图数据库)~~ +- [x] ~~demo-docker(打包成 docker 镜像)~~ +- [x] ~~demo-multi-datasource-jpa(集成JPA多数据源)~~ +- [x] ~~demo-multi-datasource-mybatis(集成mybatis多数据源)~~ +- [x] ~~demo-sharding-jdbc(集成 sharding-jdbc 实现分库分表)~~ +- [ ] demo-tio(集成 tio) +- [ ] demo-grpc(集成grpc,配置tls/ssl)参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5) +- [x] ~~demo-codegen(集成 velocity 自动生成代码)~~ +- [x] ~~demo-graylog(集成 gralog 日志管理)~~ +- [ ] demo-sso(集成单点登录)参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12) +- [x] ~~demo-ldap (集成 ldap)参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23)~~ +- [x] ~~demo-dynamic-datasource(动态添加数据源,切换数据源)~~ +- [x] ~~demo-ratelimit-guava(单机限流保护API,集成 Guava 的 RateLimiter)~~ +- [x] ~~demo-ratelimit-redis(分布式限流保护API,使用 Redis + lua 脚本实现)~~ +- [x] ~~demo-https(集成 HTTPS)~~ +- [x] ~~demo-elasticsearch-rest-high-level-client(集成 Elasticsearch 7.x 版本,使用官方 rest high level client操作 ES 数据)~~ +- [ ] demo-springbatch(数据处理) +- [ ] demo-security-justauth(使用 JustAuth 登录 GitHub,使用 Security 管理登录状态) +- [x] ~~demo-flyway(集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制)~~ ## 备注 From f56236a966e0aa1db8a8f5434633787cb19e66dd Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Sun, 25 Oct 2020 11:27:29 +0800 Subject: [PATCH 03/16] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringBootDemoActivitiApplication.java | 9 +-- .../config/SecurityConfiguration.java | 9 +-- .../xkcoding/activiti/util/SecurityUtil.java | 9 +-- .../SpringBootDemoActuatorApplication.java | 9 +-- .../SpringBootDemoAdminClientApplication.java | 9 +-- .../client/controller/IndexController.java | 9 +-- demo-admin/admin-server/README.md | 9 +-- .../SpringBootDemoAdminServerApplication.java | 9 +-- demo-async/README.md | 29 ++------ .../async/SpringBootDemoAsyncApplication.java | 9 +-- .../com/xkcoding/async/task/TaskFactory.java | 9 +-- .../xkcoding/async/task/TaskFactoryTest.java | 11 +-- demo-cache-ehcache/README.md | 29 ++------ ...SpringBootDemoCacheEhcacheApplication.java | 9 +-- .../xkcoding/cache/ehcache/entity/User.java | 9 +-- .../cache/ehcache/service/UserService.java | 9 +-- .../ehcache/service/impl/UserServiceImpl.java | 9 +-- .../ehcache/service/UserServiceTest.java | 11 +-- demo-cache-redis/README.md | 38 +++------- .../cache/redis/config/RedisConfig.java | 9 +-- .../com/xkcoding/cache/redis/entity/User.java | 9 +-- .../cache/redis/service/UserService.java | 9 +-- .../redis/service/impl/UserServiceImpl.java | 9 +-- .../com/xkcoding/cache/redis/RedisTest.java | 9 +-- .../cache/redis/service/UserServiceTest.java | 9 +-- demo-codegen/README.md | 11 +-- .../SpringBootDemoCodegenApplication.java | 9 +-- .../xkcoding/codegen/common/IResultCode.java | 9 +-- .../xkcoding/codegen/common/PageResult.java | 9 +-- .../java/com/xkcoding/codegen/common/R.java | 9 +-- .../xkcoding/codegen/common/ResultCode.java | 9 +-- .../codegen/constants/GenConstants.java | 9 +-- .../codegen/controller/CodeGenController.java | 9 +-- .../xkcoding/codegen/entity/ColumnEntity.java | 9 +-- .../xkcoding/codegen/entity/GenConfig.java | 9 +-- .../xkcoding/codegen/entity/TableEntity.java | 9 +-- .../xkcoding/codegen/entity/TableRequest.java | 9 +-- .../codegen/service/CodeGenService.java | 9 +-- .../service/impl/CodeGenServiceImpl.java | 9 +-- .../xkcoding/codegen/utils/CodeGenUtil.java | 9 +-- .../com/xkcoding/codegen/utils/DbUtil.java | 9 +-- .../static/libs/datejs/date-zh-CN.js | 4 +- .../resources/template/Controller.java.vm | 9 +-- .../main/resources/template/Entity.java.vm | 9 +-- .../main/resources/template/Mapper.java.vm | 9 +-- .../main/resources/template/Service.java.vm | 9 +-- .../resources/template/ServiceImpl.java.vm | 9 +-- .../xkcoding/codegen/CodeGenServiceTest.java | 9 +-- .../SpringBootDemoDockerApplication.java | 9 +-- .../docker/controller/HelloController.java | 9 +-- demo-dubbo/dubbo-common/README.md | 11 +-- .../dubbo/common/service/HelloService.java | 9 +-- demo-dubbo/dubbo-consumer/README.md | 20 ++--- ...pringBootDemoDubboConsumerApplication.java | 9 +-- .../consumer/controller/HelloController.java | 9 +-- demo-dubbo/dubbo-provider/README.md | 18 +---- ...pringBootDemoDubboProviderApplication.java | 9 +-- .../provider/service/HelloServiceImpl.java | 9 +-- demo-dynamic-datasource/README.md | 26 +++---- ...gBootDemoDynamicDatasourceApplication.java | 2 +- .../annotation/DefaultDatasource.java | 2 +- .../aspect/DatasourceSelectorAspect.java | 2 +- .../config/DatasourceConfiguration.java | 2 +- .../dynamic/datasource/config/MyMapper.java | 2 +- .../config/MybatisConfiguration.java | 2 +- .../DatasourceConfigController.java | 2 +- .../datasource/controller/UserController.java | 2 +- .../datasource/DatasourceConfigCache.java | 2 +- .../DatasourceConfigContextHolder.java | 2 +- .../datasource/DatasourceHolder.java | 2 +- .../datasource/DatasourceManager.java | 2 +- .../datasource/DatasourceScheduler.java | 2 +- .../datasource/DynamicDataSource.java | 2 +- .../mapper/DatasourceConfigMapper.java | 2 +- .../dynamic/datasource/mapper/UserMapper.java | 2 +- .../datasource/model/DatasourceConfig.java | 2 +- .../dynamic/datasource/model/User.java | 2 +- .../dynamic/datasource/utils/SpringUtil.java | 2 +- .../README.md | 10 +-- .../ElasticsearchApplication.java | 2 +- .../xkcoding/elasticsearch/common/Result.java | 2 +- .../elasticsearch/common/ResultCode.java | 2 +- .../ElasticsearchAutoConfiguration.java | 2 +- .../config/ElasticsearchProperties.java | 2 +- .../contants/ElasticsearchConstant.java | 2 +- .../exception/ElasticsearchException.java | 2 +- .../xkcoding/elasticsearch/model/Person.java | 2 +- .../elasticsearch/service/PersonService.java | 2 +- .../base/BaseElasticsearchService.java | 2 +- .../service/impl/PersonServiceImpl.java | 2 +- demo-elasticsearch/README.md | 42 +++-------- ...pringBootDemoElasticsearchApplication.java | 9 +-- .../elasticsearch/constants/EsConsts.java | 9 +-- .../xkcoding/elasticsearch/model/Person.java | 9 +-- .../repository/PersonRepository.java | 9 +-- .../repository/PersonRepositoryTest.java | 11 +-- .../elasticsearch/template/TemplateTest.java | 9 +-- demo-email/README.md | 33 +++------ .../email/SpringBootDemoEmailApplication.java | 9 +-- .../xkcoding/email/service/MailService.java | 11 +-- .../email/service/impl/MailServiceImpl.java | 9 +-- .../java/com/xkcoding/email/PasswordTest.java | 2 +- .../email/service/MailServiceTest.java | 9 +-- demo-exception-handler/README.md | 18 +---- ...ngBootDemoExceptionHandlerApplication.java | 9 +-- .../exception/handler/constant/Status.java | 11 +-- .../handler/controller/TestController.java | 9 +-- .../handler/exception/BaseException.java | 9 +-- .../handler/exception/JsonException.java | 9 +-- .../handler/exception/PageException.java | 9 +-- .../handler/handler/DemoExceptionHandler.java | 9 +-- .../exception/handler/model/ApiResponse.java | 9 +-- .../SpringBootDemoFlywayApplication.java | 2 +- .../SpringBootDemoGraylogApplication.java | 9 +-- demo-helloworld/README.md | 9 +-- .../SpringBootDemoHelloworldApplication.java | 9 +-- demo-https/README.md | 4 +- .../https/SpringBootDemoHttpsApplication.java | 2 +- .../xkcoding/https/config/HttpsConfig.java | 2 +- demo-ldap/README.md | 16 ++-- .../xkcoding/ldap/LdapDemoApplication.java | 2 +- .../java/com/xkcoding/ldap/api/Result.java | 2 +- .../com/xkcoding/ldap/api/ResultCode.java | 2 +- .../java/com/xkcoding/ldap/entity/Person.java | 2 +- .../ldap/exception/ServiceException.java | 2 +- .../ldap/repository/PersonRepository.java | 2 +- .../xkcoding/ldap/request/LoginRequest.java | 2 +- .../xkcoding/ldap/service/PersonService.java | 2 +- .../ldap/service/impl/PersonServiceImpl.java | 2 +- .../com/xkcoding/ldap/util/LdapUtils.java | 2 +- .../ldap/LdapDemoApplicationTests.java | 2 +- demo-log-aop/README.md | 18 +---- .../aop/SpringBootDemoLogAopApplication.java | 9 +-- .../com/xkcoding/log/aop/aspectj/AopLog.java | 9 +-- .../log/aop/controller/TestController.java | 9 +-- demo-logback/README.md | 9 +-- .../SpringBootDemoLogbackApplication.java | 9 +-- demo-mongodb/README.md | 29 ++------ .../SpringBootDemoMongodbApplication.java | 9 +-- .../com/xkcoding/mongodb/model/Article.java | 9 +-- .../mongodb/repository/ArticleRepository.java | 9 +-- .../repository/ArticleRepositoryTest.java | 11 +-- demo-mq-kafka/README.md | 18 +---- .../SpringBootDemoMqKafkaApplication.java | 9 +-- .../xkcoding/mq/kafka/config/KafkaConfig.java | 9 +-- .../mq/kafka/constants/KafkaConsts.java | 9 +-- .../mq/kafka/handler/MessageHandler.java | 9 +-- demo-mq-rabbitmq/README.md | 33 +++------ .../SpringBootDemoMqRabbitmqApplication.java | 9 +-- .../mq/rabbitmq/config/RabbitMqConfig.java | 9 +-- .../mq/rabbitmq/constants/RabbitConsts.java | 9 +-- .../rabbitmq/handler/DelayQueueHandler.java | 9 +-- .../handler/DirectQueueOneHandler.java | 9 +-- .../rabbitmq/handler/QueueThreeHandler.java | 9 +-- .../mq/rabbitmq/handler/QueueTwoHandler.java | 9 +-- .../mq/rabbitmq/message/MessageStruct.java | 9 +-- demo-multi-datasource-jpa/README.md | 38 +++------- ...BootDemoMultiDatasourceJpaApplication.java | 9 +-- .../jpa/config/PrimaryDataSourceConfig.java | 9 +-- .../jpa/config/PrimaryJpaConfig.java | 10 +-- .../jpa/config/SecondDataSourceConfig.java | 9 +-- .../jpa/config/SecondJpaConfig.java | 9 +-- .../jpa/config/SnowflakeConfig.java | 9 +-- .../jpa/entity/primary/PrimaryMultiTable.java | 11 +-- .../jpa/entity/second/SecondMultiTable.java | 14 ++-- .../primary/PrimaryMultiTableRepository.java | 9 +-- .../second/SecondMultiTableRepository.java | 9 +-- demo-multi-datasource-mybatis/README.md | 64 +++++----------- ...DemoMultiDatasourceMybatisApplication.java | 9 +-- .../datasource/mybatis/mapper/UserMapper.java | 9 +-- .../multi/datasource/mybatis/model/User.java | 11 +-- .../mybatis/service/UserService.java | 9 +-- .../mybatis/service/impl/UserServiceImpl.java | 9 +-- .../service/impl/UserServiceImplTest.java | 11 +-- demo-neo4j/README.md | 38 +++------- .../neo4j/SpringBootDemoNeo4jApplication.java | 9 +-- .../neo4j/config/CustomIdStrategy.java | 9 +-- .../xkcoding/neo4j/constants/NeoConsts.java | 9 +-- .../java/com/xkcoding/neo4j/model/Class.java | 9 +-- .../java/com/xkcoding/neo4j/model/Lesson.java | 9 +-- .../com/xkcoding/neo4j/model/Student.java | 9 +-- .../com/xkcoding/neo4j/model/Teacher.java | 9 +-- .../payload/ClassmateInfoGroupByLesson.java | 9 +-- .../neo4j/payload/TeacherStudent.java | 9 +-- .../neo4j/repository/ClassRepository.java | 9 +-- .../neo4j/repository/LessonRepository.java | 9 +-- .../neo4j/repository/StudentRepository.java | 9 +-- .../neo4j/repository/TeacherRepository.java | 9 +-- .../xkcoding/neo4j/service/NeoService.java | 9 +-- .../java/com/xkcoding/neo4j/Neo4jTest.java | 9 +-- .../oauth/SpringBootDemoOauthApplication.java | 11 +-- .../config/ClientLoginFailureHandler.java | 2 +- .../config/ClientLogoutSuccessHandler.java | 2 +- .../Oauth2AuthorizationServerConfig.java | 2 +- .../Oauth2AuthorizationTokenConfig.java | 2 +- .../oauth/config/WebSecurityConfig.java | 2 +- .../xkcoding/oauth/config/package-info.java | 2 +- .../controller/AuthorizationController.java | 2 +- .../oauth/controller/Oauth2Controller.java | 2 +- .../oauth/controller/package-info.java | 2 +- .../oauth/entity/SysClientDetails.java | 2 +- .../com/xkcoding/oauth/entity/SysRole.java | 3 +- .../com/xkcoding/oauth/entity/SysUser.java | 2 +- .../SysClientDetailsRepository.java | 2 +- .../oauth/repostiory/SysUserRepository.java | 2 +- .../service/SysClientDetailsService.java | 2 +- .../oauth/service/SysUserService.java | 2 +- .../impl/SysClientDetailsServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 2 +- .../xkcoding/oauth/service/package-info.java | 2 +- .../xkcoding/oauth/PasswordEncodeTest.java | 2 +- .../oauth/AuthorizationCodeGrantTests.java | 2 +- .../oauth/oauth/AuthorizationServerInfo.java | 2 +- .../ResourceOwnerPasswordGrantTests.java | 2 +- .../repostiory/SysClientDetailsTest.java | 2 +- .../repostiory/SysUserRepositoryTest.java | 2 +- .../SpringBootDemoResourceApplication.java | 2 +- .../config/OauthResourceServerConfig.java | 2 +- .../config/OauthResourceTokenConfig.java | 2 +- .../oauth/controller/TestController.java | 2 +- .../com/xkcoding/oauth/AuthorizationTest.java | 2 +- .../oauth/controller/TestControllerTest.java | 2 +- demo-orm-beetlsql/README.md | 40 +++------- .../SpringBootDemoOrmBeetlsqlApplication.java | 9 +-- .../orm/beetlsql/config/BeetlConfig.java | 9 +-- .../xkcoding/orm/beetlsql/dao/UserDao.java | 9 +-- .../xkcoding/orm/beetlsql/entity/User.java | 9 +-- .../orm/beetlsql/service/UserService.java | 9 +-- .../service/impl/UserServiceImpl.java | 9 +-- .../orm/beetlsql/service/UserServiceTest.java | 12 +-- demo-orm-jdbctemplate/README.md | 11 +-- ...ingBootDemoOrmJdbctemplateApplication.java | 11 +-- .../orm/jdbctemplate/annotation/Column.java | 9 +-- .../orm/jdbctemplate/annotation/Ignore.java | 9 +-- .../orm/jdbctemplate/annotation/Pk.java | 9 +-- .../orm/jdbctemplate/annotation/Table.java | 9 +-- .../orm/jdbctemplate/constant/Const.java | 9 +-- .../controller/UserController.java | 9 +-- .../orm/jdbctemplate/dao/UserDao.java | 9 +-- .../orm/jdbctemplate/dao/base/BaseDao.java | 9 +-- .../orm/jdbctemplate/entity/User.java | 9 +-- .../jdbctemplate/service/IUserService.java | 9 +-- .../service/impl/UserServiceImpl.java | 9 +-- demo-orm-jpa/README.md | 74 +++++-------------- .../jpa/SpringBootDemoOrmJpaApplication.java | 9 +-- .../xkcoding/orm/jpa/config/JpaConfig.java | 9 +-- .../xkcoding/orm/jpa/entity/Department.java | 9 +-- .../com/xkcoding/orm/jpa/entity/User.java | 9 +-- .../jpa/entity/base/AbstractAuditModel.java | 9 +-- .../orm/jpa/repository/DepartmentDao.java | 9 +-- .../xkcoding/orm/jpa/repository/UserDao.java | 11 +-- .../orm/jpa/repository/DepartmentDaoTest.java | 9 +-- .../orm/jpa/repository/UserDaoTest.java | 11 +-- demo-orm-mybatis-mapper-page/README.md | 29 ++------ ...otDemoOrmMybatisMapperPageApplication.java | 9 +-- .../mybatis/MapperAndPage/entity/User.java | 9 +-- .../MapperAndPage/mapper/UserMapper.java | 9 +-- .../MapperAndPage/mapper/UserMapperTest.java | 11 +-- demo-orm-mybatis-plus/README.md | 60 ++++----------- ...ringBootDemoOrmMybatisPlusApplication.java | 10 +-- .../plus/config/CommonFieldHandler.java | 9 +-- .../plus/config/MybatisPlusConfig.java | 9 +-- .../orm/mybatis/plus/entity/Role.java | 2 +- .../orm/mybatis/plus/entity/User.java | 9 +-- .../orm/mybatis/plus/mapper/RoleMapper.java | 2 +- .../orm/mybatis/plus/mapper/UserMapper.java | 9 +-- .../orm/mybatis/plus/service/UserService.java | 9 +-- .../plus/service/impl/UserServiceImpl.java | 9 +-- .../plus/activerecord/ActiveRecordTest.java | 2 +- .../mybatis/plus/service/UserServiceTest.java | 12 +-- demo-orm-mybatis/README.md | 27 ++----- .../SpringBootDemoOrmMybatisApplication.java | 9 +-- .../com/xkcoding/orm/mybatis/entity/User.java | 9 +-- .../orm/mybatis/mapper/UserMapper.java | 9 +-- .../orm/mybatis/mapper/UserMapperTest.java | 11 +-- demo-properties/README.md | 27 ++----- .../SpringBootDemoPropertiesApplication.java | 9 +-- .../controller/PropertyController.java | 9 +-- .../property/ApplicationProperty.java | 9 +-- .../property/DeveloperProperty.java | 9 +-- demo-ratelimit-guava/README.md | 6 +- ...ringBootDemoRatelimitGuavaApplication.java | 2 +- .../guava/annotation/RateLimiter.java | 2 +- .../guava/aspect/RateLimiterAspect.java | 2 +- .../guava/controller/TestController.java | 2 +- .../guava/handler/GlobalExceptionHandler.java | 2 +- demo-ratelimit-redis/README.md | 6 +- ...ringBootDemoRatelimitRedisApplication.java | 2 +- .../redis/annotation/RateLimiter.java | 2 +- .../redis/aspect/RateLimiterAspect.java | 2 +- .../ratelimit/redis/config/RedisConfig.java | 2 +- .../redis/controller/TestController.java | 2 +- .../redis/handler/GlobalExceptionHandler.java | 2 +- .../xkcoding/ratelimit/redis/util/IpUtil.java | 2 +- demo-rbac-security/README.md | 65 ++++------------ ...SpringBootDemoRbacSecurityApplication.java | 9 +-- .../rbac/security/common/ApiResponse.java | 9 +-- .../rbac/security/common/BaseException.java | 9 +-- .../xkcoding/rbac/security/common/Consts.java | 9 +-- .../rbac/security/common/IStatus.java | 11 +-- .../rbac/security/common/PageResult.java | 9 +-- .../xkcoding/rbac/security/common/Status.java | 9 +-- .../rbac/security/config/CustomConfig.java | 9 +-- .../rbac/security/config/IdConfig.java | 9 +-- .../rbac/security/config/IgnoreConfig.java | 9 +-- .../config/JwtAuthenticationFilter.java | 9 +-- .../rbac/security/config/JwtConfig.java | 9 +-- .../security/config/RbacAuthorityService.java | 11 +-- .../rbac/security/config/RedisConfig.java | 9 +-- .../rbac/security/config/SecurityConfig.java | 9 +-- .../config/SecurityHandlerConfig.java | 9 +-- .../rbac/security/config/WebMvcConfig.java | 11 +-- .../security/controller/AuthController.java | 10 +-- .../controller/MonitorController.java | 9 +-- .../security/controller/TestController.java | 9 +-- .../security/exception/SecurityException.java | 9 +-- .../handler/GlobalExceptionHandler.java | 9 +-- .../rbac/security/model/Permission.java | 9 +-- .../xkcoding/rbac/security/model/Role.java | 9 +-- .../rbac/security/model/RolePermission.java | 9 +-- .../xkcoding/rbac/security/model/User.java | 9 +-- .../rbac/security/model/UserRole.java | 9 +-- .../model/unionkey/RolePermissionKey.java | 9 +-- .../security/model/unionkey/UserRoleKey.java | 11 +-- .../rbac/security/payload/LoginRequest.java | 9 +-- .../rbac/security/payload/PageCondition.java | 9 +-- .../security/repository/PermissionDao.java | 9 +-- .../rbac/security/repository/RoleDao.java | 9 +-- .../repository/RolePermissionDao.java | 9 +-- .../rbac/security/repository/UserDao.java | 9 +-- .../rbac/security/repository/UserRoleDao.java | 9 +-- .../service/CustomUserDetailsService.java | 9 +-- .../rbac/security/service/MonitorService.java | 9 +-- .../xkcoding/rbac/security/util/JwtUtil.java | 9 +-- .../xkcoding/rbac/security/util/PageUtil.java | 9 +-- .../rbac/security/util/RedisUtil.java | 9 +-- .../rbac/security/util/ResponseUtil.java | 11 +-- .../rbac/security/util/SecurityUtil.java | 9 +-- .../rbac/security/vo/JwtResponse.java | 9 +-- .../xkcoding/rbac/security/vo/OnlineUser.java | 9 +-- .../rbac/security/vo/UserPrincipal.java | 11 +-- .../security/repository/DataInitTest.java | 9 +-- .../rbac/security/repository/UserDaoTest.java | 12 +-- .../rbac/security/util/RedisUtilTest.java | 11 +-- .../SpringBootDemoRbacShiroApplication.java | 9 +-- .../rbac/shiro/common/IResultCode.java | 9 +-- .../com/xkcoding/rbac/shiro/common/R.java | 9 +-- .../rbac/shiro/common/ResultCode.java | 9 +-- .../rbac/shiro/config/MybatisPlusConfig.java | 9 +-- .../rbac/shiro/controller/TestController.java | 9 +-- .../SpringBootDemoSessionApplication.java | 9 +-- .../xkcoding/session/config/WebMvcConfig.java | 9 +-- .../xkcoding/session/constants/Consts.java | 9 +-- .../session/controller/PageController.java | 9 +-- .../interceptor/SessionInterceptor.java | 9 +-- demo-sharding-jdbc/README.md | 33 +++------ ...SpringBootDemoShardingJdbcApplication.java | 10 +-- .../config/CustomSnowflakeKeyGenerator.java | 9 +-- .../jdbc/config/DataSourceShardingConfig.java | 9 +-- .../sharding/jdbc/mapper/OrderMapper.java | 9 +-- .../xkcoding/sharding/jdbc/model/Order.java | 9 +-- ...gBootDemoShardingJdbcApplicationTests.java | 9 +-- demo-social/README.md | 53 ++++++------- .../social/controller/OauthController.java | 9 +-- demo-swagger-beauty/README.md | 29 ++------ ...pringBootDemoSwaggerBeautyApplication.java | 9 +-- .../swagger/beauty/common/ApiResponse.java | 9 +-- .../beauty/controller/UserController.java | 9 +-- .../xkcoding/swagger/beauty/entity/User.java | 9 +-- demo-swagger/README.md | 27 ++----- .../SpringBootDemoSwaggerApplication.java | 9 +-- .../xkcoding/swagger/common/ApiResponse.java | 9 +-- .../com/xkcoding/swagger/common/DataType.java | 11 +-- .../xkcoding/swagger/common/ParamType.java | 11 +-- .../swagger/config/Swagger2Config.java | 11 +-- .../swagger/controller/UserController.java | 9 +-- .../com/xkcoding/swagger/entity/User.java | 9 +-- demo-task-quartz/init/dbTables/tables_db2.sql | 14 ++-- .../init/dbTables/tables_db2_v72.sql | 16 ++-- demo-task-quartz/init/dbTables/tables_h2.sql | 38 +++++----- .../init/dbTables/tables_pointbase.sql | 34 ++++----- .../SpringBootDemoTaskQuartzApplication.java | 9 +-- .../task/quartz/common/ApiResponse.java | 9 +-- .../task/quartz/controller/JobController.java | 9 +-- .../quartz/entity/domain/JobAndTrigger.java | 11 +-- .../task/quartz/entity/form/JobForm.java | 9 +-- .../xkcoding/task/quartz/job/HelloJob.java | 11 +-- .../com/xkcoding/task/quartz/job/TestJob.java | 11 +-- .../task/quartz/job/base/BaseJob.java | 9 +-- .../task/quartz/mapper/JobMapper.java | 9 +-- .../task/quartz/service/JobService.java | 10 +-- .../quartz/service/impl/JobServiceImpl.java | 9 +-- .../xkcoding/task/quartz/util/JobUtil.java | 9 +-- demo-task/README.md | 20 ++--- .../task/SpringBootDemoTaskApplication.java | 9 +-- .../com/xkcoding/task/config/TaskConfig.java | 9 +-- .../java/com/xkcoding/task/job/TaskJob.java | 11 +-- demo-template-beetl/README.md | 18 +---- ...pringBootDemoTemplateBeetlApplication.java | 9 +-- .../beetl/controller/IndexController.java | 9 +-- .../beetl/controller/UserController.java | 9 +-- .../xkcoding/template/beetl/model/User.java | 9 +-- demo-template-enjoy/README.md | 27 ++----- ...pringBootDemoTemplateEnjoyApplication.java | 9 +-- .../template/enjoy/config/EnjoyConfig.java | 9 +-- .../enjoy/controller/IndexController.java | 9 +-- .../enjoy/controller/UserController.java | 9 +-- .../xkcoding/template/enjoy/model/User.java | 9 +-- demo-template-freemarker/README.md | 18 +---- ...BootDemoTemplateFreemarkerApplication.java | 9 +-- .../controller/IndexController.java | 9 +-- .../freemarker/controller/UserController.java | 9 +-- .../template/freemarker/model/User.java | 9 +-- demo-template-thymeleaf/README.md | 18 +---- ...gBootDemoTemplateThymeleafApplication.java | 9 +-- .../thymeleaf/controller/IndexController.java | 9 +-- .../thymeleaf/controller/UserController.java | 9 +-- .../template/thymeleaf/model/User.java | 9 +-- .../SpringBootDemoTioApplication.java | 9 +-- demo-upload/README.md | 27 ++----- .../SpringBootDemoUploadApplication.java | 9 +-- .../xkcoding/upload/config/UploadConfig.java | 9 +-- .../upload/controller/IndexController.java | 9 +-- .../upload/controller/UploadController.java | 9 +-- .../upload/service/IQiNiuService.java | 9 +-- .../upload/service/impl/QiNiuServiceImpl.java | 9 +-- .../SpringBootDemoUreport2Application.java | 9 +-- .../urule/SpringBootDemoUruleApplication.java | 9 +-- demo-war/README.md | 11 +-- .../war/SpringBootDemoWarApplication.java | 9 +-- demo-websocket-socketio/README.md | 29 ++------ ...gBootDemoWebsocketSocketioApplication.java | 9 +-- .../websocket/socketio/config/DbTemplate.java | 9 +-- .../websocket/socketio/config/Event.java | 9 +-- .../socketio/config/ServerConfig.java | 9 +-- .../websocket/socketio/config/WsConfig.java | 9 +-- .../controller/MessageController.java | 9 +-- .../socketio/handler/MessageEventHandler.java | 9 +-- .../websocket/socketio/init/ServerRunner.java | 9 +-- .../payload/BroadcastMessageRequest.java | 9 +-- .../socketio/payload/GroupMessageRequest.java | 9 +-- .../socketio/payload/JoinRequest.java | 9 +-- .../payload/SingleMessageRequest.java | 9 +-- demo-websocket/README.md | 20 ++--- .../SpringBootDemoWebsocketApplication.java | 9 +-- .../websocket/common/WebSocketConsts.java | 9 +-- .../websocket/config/WebSocketConfig.java | 9 +-- .../controller/ServerController.java | 9 +-- .../com/xkcoding/websocket/model/Server.java | 11 +-- .../xkcoding/websocket/model/server/Cpu.java | 11 +-- .../xkcoding/websocket/model/server/Jvm.java | 11 +-- .../xkcoding/websocket/model/server/Mem.java | 11 +-- .../xkcoding/websocket/model/server/Sys.java | 11 +-- .../websocket/model/server/SysFile.java | 11 +-- .../com/xkcoding/websocket/payload/KV.java | 9 +-- .../xkcoding/websocket/payload/ServerVO.java | 9 +-- .../websocket/payload/server/CpuVO.java | 11 +-- .../websocket/payload/server/JvmVO.java | 11 +-- .../websocket/payload/server/MemVO.java | 11 +-- .../websocket/payload/server/SysFileVO.java | 11 +-- .../websocket/payload/server/SysVO.java | 11 +-- .../xkcoding/websocket/task/ServerTask.java | 9 +-- .../com/xkcoding/websocket/util/IpUtil.java | 11 +-- .../xkcoding/websocket/util/ServerUtil.java | 9 +-- demo-zookeeper/README.md | 47 +++--------- .../SpringBootDemoZookeeperApplication.java | 9 +-- .../zookeeper/annotation/LockKeyParam.java | 9 +-- .../zookeeper/annotation/ZooLock.java | 9 +-- .../zookeeper/aspectj/ZooLockAspect.java | 9 +-- .../xkcoding/zookeeper/config/ZkConfig.java | 9 +-- .../zookeeper/config/props/ZkProps.java | 9 +-- 471 files changed, 1183 insertions(+), 3442 deletions(-) diff --git a/demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java b/demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java index 0389381c5..f8d5c99f8 100644 --- a/demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java +++ b/demo-activiti/src/main/java/com/xkcoding/activiti/SpringBootDemoActivitiApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.activiti - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-03-31 22:24 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-31 22:24 */ @SpringBootApplication public class SpringBootDemoActivitiApplication { diff --git a/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java index 3d9799f9e..0f9275a1b 100644 --- a/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java +++ b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java @@ -21,13 +21,8 @@ * 安全配置类 *

* - * @package: com.xkcoding.activiti.config - * @description: 安全配置类 - * @author: yangkai.shen - * @date: Created in 2019-07-01 18:40 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-07-01 18:40 */ @Slf4j @Configuration diff --git a/demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java b/demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java index aa7897b61..33a6986de 100755 --- a/demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java +++ b/demo-activiti/src/main/java/com/xkcoding/activiti/util/SecurityUtil.java @@ -17,13 +17,8 @@ * 认证工具 *

* - * @package: com.xkcoding.activiti.util - * @description: 认证工具 - * @author: yangkai.shen - * @date: Created in 2019-07-01 18:38 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-07-01 18:38 */ @Component @RequiredArgsConstructor(onConstructor_ = @Autowired) diff --git a/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java index 6774035e2..7e8b28d86 100644 --- a/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java +++ b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.actuator - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/29 2:27 PM - * @copyright: Copyright (c)2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-9-29 14:27 */ @SpringBootApplication public class SpringBootDemoActuatorApplication { diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java index 0b3527bda..1d38979f8 100644 --- a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java +++ b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.admin.client - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/8 2:16 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-8 14:16 */ @SpringBootApplication public class SpringBootDemoAdminClientApplication { diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java index 3fd383f01..c835083e4 100644 --- a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java +++ b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java @@ -8,13 +8,8 @@ * 首页 *

* - * @package: com.xkcoding.admin.client.controller - * @description: 首页 - * @author: yangkai.shen - * @date: Created in 2018/10/8 2:15 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-08 14:15 */ @RestController public class IndexController { diff --git a/demo-admin/admin-server/README.md b/demo-admin/admin-server/README.md index 9600eb8ad..f89cd313c 100644 --- a/demo-admin/admin-server/README.md +++ b/demo-admin/admin-server/README.md @@ -68,13 +68,8 @@ * 启动类 *

* - * @package: com.xkcoding.admin.server - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/8 2:08 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-08 14:08 */ @EnableAdminServer @SpringBootApplication diff --git a/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java b/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java index 1e2b8fb7e..110b240d6 100644 --- a/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java +++ b/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java @@ -9,13 +9,8 @@ * 启动类 *

* - * @package: com.xkcoding.admin.server - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/8 2:08 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-08 14:08 */ @EnableAdminServer @SpringBootApplication diff --git a/demo-async/README.md b/demo-async/README.md index 3f46a9f22..4561544ce 100644 --- a/demo-async/README.md +++ b/demo-async/README.md @@ -90,13 +90,8 @@ spring: * 启动器 *

* - * @package: com.xkcoding.async - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:28 */ @EnableAsync @SpringBootApplication @@ -117,13 +112,8 @@ public class SpringBootDemoAsyncApplication { * 任务工厂 *

* - * @package: com.xkcoding.async.task - * @description: 任务工厂 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:37 */ @Component @Slf4j @@ -193,13 +183,8 @@ public class TaskFactory { * 测试任务 *

* - * @package: com.xkcoding.async.task - * @description: 测试任务 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:49 */ @Slf4j public class TaskFactoryTest extends SpringBootDemoAsyncApplicationTests { @@ -269,4 +254,4 @@ public class TaskFactoryTest extends SpringBootDemoAsyncApplicationTests { ## 参考 -- Spring Boot 异步任务线程池的配置 参考官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling \ No newline at end of file +- Spring Boot 异步任务线程池的配置 参考官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling diff --git a/demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java b/demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java index 10eaa4a0e..6d1e8e823 100644 --- a/demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java +++ b/demo-async/src/main/java/com/xkcoding/async/SpringBootDemoAsyncApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.async - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:28 */ @EnableAsync @SpringBootApplication diff --git a/demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java b/demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java index 1cd30a7c2..e49211036 100644 --- a/demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java +++ b/demo-async/src/main/java/com/xkcoding/async/task/TaskFactory.java @@ -13,13 +13,8 @@ * 任务工厂 *

* - * @package: com.xkcoding.async.task - * @description: 任务工厂 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:37 */ @Component @Slf4j diff --git a/demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java b/demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java index 326807b50..89a226f94 100644 --- a/demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java +++ b/demo-async/src/test/java/com/xkcoding/async/task/TaskFactoryTest.java @@ -13,13 +13,8 @@ * 测试任务 *

* - * @package: com.xkcoding.async.task - * @description: 测试任务 - * @author: yangkai.shen - * @date: Created in 2018-12-29 10:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 10:49 */ @Slf4j public class TaskFactoryTest extends SpringBootDemoAsyncApplicationTests { @@ -58,4 +53,4 @@ public void taskTest() throws InterruptedException { log.info("同步任务全部执行结束,总耗时:{} 毫秒", (end - start)); } -} \ No newline at end of file +} diff --git a/demo-cache-ehcache/README.md b/demo-cache-ehcache/README.md index dd071bab2..2d99cc629 100644 --- a/demo-cache-ehcache/README.md +++ b/demo-cache-ehcache/README.md @@ -84,13 +84,8 @@ * 启动类 *

* - * @package: com.xkcoding.cache.ehcache - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/11/16 17:02 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 17:02 */ @SpringBootApplication @EnableCaching @@ -165,13 +160,8 @@ logging: * UserService *

* - * @package: com.xkcoding.cache.ehcache.service.impl - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:54 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:54 */ @Service @Slf4j @@ -240,13 +230,8 @@ public class UserServiceImpl implements UserService { * ehcache缓存测试 *

* - * @package: com.xkcoding.cache.ehcache.service - * @description: ehcache缓存测试 - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:58 */ @Slf4j public class UserServiceTest extends SpringBootDemoCacheEhcacheApplicationTests { @@ -298,4 +283,4 @@ public class UserServiceTest extends SpringBootDemoCacheEhcacheApplicationTests - Ehcache 官网:http://www.ehcache.org/documentation/ - Spring Boot 官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-caching-provider-ehcache2 -- 博客:https://juejin.im/post/5b308de9518825748b56ae1d \ No newline at end of file +- 博客:https://juejin.im/post/5b308de9518825748b56ae1d diff --git a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java index 4b4f0820f..2fdf43fb0 100644 --- a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java +++ b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/SpringBootDemoCacheEhcacheApplication.java @@ -9,13 +9,8 @@ * 启动类 *

* - * @package: com.xkcoding.cache.ehcache - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/11/16 17:02 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 17:02 */ @SpringBootApplication @EnableCaching diff --git a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java index 20c81876b..522357b73 100644 --- a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java +++ b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/entity/User.java @@ -11,13 +11,8 @@ * 用户实体 *

* - * @package: com.xkcoding.cache.ehcache.entity - * @description: 用户实体 - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:53 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:53 */ @Data @AllArgsConstructor diff --git a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java index f607d028c..79fc0f4fd 100644 --- a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java +++ b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/UserService.java @@ -7,13 +7,8 @@ * UserService *

* - * @package: com.xkcoding.cache.ehcache.service - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:53 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:53 */ public interface UserService { /** diff --git a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java index dca99490f..a013ba787 100644 --- a/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java +++ b/demo-cache-ehcache/src/main/java/com/xkcoding/cache/ehcache/service/impl/UserServiceImpl.java @@ -16,13 +16,8 @@ * UserService *

* - * @package: com.xkcoding.cache.ehcache.service.impl - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:54 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:54 */ @Service @Slf4j diff --git a/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java b/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java index 0720b542e..00d3b0fe0 100644 --- a/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java +++ b/demo-cache-ehcache/src/test/java/com/xkcoding/cache/ehcache/service/UserServiceTest.java @@ -11,13 +11,8 @@ * ehcache缓存测试 *

* - * @package: com.xkcoding.cache.ehcache.service - * @description: ehcache缓存测试 - * @author: yangkai.shen - * @date: Created in 2018/11/16 16:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-16 16:58 */ @Slf4j public class UserServiceTest extends SpringBootDemoCacheEhcacheApplicationTests { @@ -62,4 +57,4 @@ public void deleteUser() { // 删除,查看ehcache是否存在缓存数据 userService.delete(1L); } -} \ No newline at end of file +} diff --git a/demo-cache-redis/README.md b/demo-cache-redis/README.md index 2f3d58e8a..7baebf54c 100644 --- a/demo-cache-redis/README.md +++ b/demo-cache-redis/README.md @@ -124,13 +124,8 @@ logging: * redis配置 *

* - * @package: com.xkcoding.cache.redis.config - * @description: redis配置 - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:41 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:41 */ @Configuration @AutoConfigureAfter(RedisAutoConfiguration.class) @@ -171,13 +166,8 @@ public class RedisConfig { * UserService *

* - * @package: com.xkcoding.cache.redis.service.impl - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:45 */ @Service @Slf4j @@ -255,13 +245,8 @@ public class UserServiceImpl implements UserService { * Redis测试 *

* - * @package: com.xkcoding.cache.redis - * @description: Redis测试 - * @author: yangkai.shen - * @date: Created in 2018/11/15 17:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 17:17 */ @Slf4j public class RedisTest extends SpringBootDemoCacheRedisApplicationTests { @@ -306,13 +291,8 @@ public class RedisTest extends SpringBootDemoCacheRedisApplicationTests { * Redis - 缓存测试 *

* - * @package: com.xkcoding.cache.redis.service - * @description: Redis - 缓存测试 - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:53 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:53 */ @Slf4j public class UserServiceTest extends SpringBootDemoCacheRedisApplicationTests { @@ -364,4 +344,4 @@ public class UserServiceTest extends SpringBootDemoCacheRedisApplicationTests { - spring-data-redis 官方文档:https://docs.spring.io/spring-data/redis/docs/2.0.1.RELEASE/reference/html/ - redis 文档:https://redis.io/documentation -- redis 中文文档:http://www.redis.cn/commands.html \ No newline at end of file +- redis 中文文档:http://www.redis.cn/commands.html diff --git a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java index da777d0b6..dae7aed60 100644 --- a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java +++ b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/config/RedisConfig.java @@ -22,13 +22,8 @@ * redis配置 *

* - * @package: com.xkcoding.cache.redis.config - * @description: redis配置 - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:41 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:41 */ @Configuration @AutoConfigureAfter(RedisAutoConfiguration.class) diff --git a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java index 3474dcb51..f3128e8b8 100644 --- a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java +++ b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/entity/User.java @@ -11,13 +11,8 @@ * 用户实体 *

* - * @package: com.xkcoding.cache.redis.entity - * @description: 用户实体 - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:39 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:39 */ @Data @AllArgsConstructor diff --git a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java index 0da3c4a37..331901b97 100644 --- a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java +++ b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/UserService.java @@ -7,13 +7,8 @@ * UserService *

* - * @package: com.xkcoding.cache.redis.service - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:45 */ public interface UserService { /** diff --git a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java index 4942d0d92..f7b7d1f46 100644 --- a/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java +++ b/demo-cache-redis/src/main/java/com/xkcoding/cache/redis/service/impl/UserServiceImpl.java @@ -16,13 +16,8 @@ * UserService *

* - * @package: com.xkcoding.cache.redis.service.impl - * @description: UserService - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:45 */ @Service @Slf4j diff --git a/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java index 55e766f46..8389ea5e9 100644 --- a/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java +++ b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/RedisTest.java @@ -17,13 +17,8 @@ * Redis测试 *

* - * @package: com.xkcoding.cache.redis - * @description: Redis测试 - * @author: yangkai.shen - * @date: Created in 2018/11/15 17:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 17:17 */ @Slf4j public class RedisTest extends SpringBootDemoCacheRedisApplicationTests { diff --git a/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java index 617594882..33187870a 100644 --- a/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java +++ b/demo-cache-redis/src/test/java/com/xkcoding/cache/redis/service/UserServiceTest.java @@ -11,13 +11,8 @@ * Redis - 缓存测试 *

* - * @package: com.xkcoding.cache.redis.service - * @description: Redis - 缓存测试 - * @author: yangkai.shen - * @date: Created in 2018/11/15 16:53 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-15 16:53 */ @Slf4j public class UserServiceTest extends SpringBootDemoCacheRedisApplicationTests { diff --git a/demo-codegen/README.md b/demo-codegen/README.md index fd0a2eab0..ce635c211 100644 --- a/demo-codegen/README.md +++ b/demo-codegen/README.md @@ -163,13 +163,8 @@ timestamp=LocalDateTime * 代码生成器 工具类 *

* - * @package: com.xkcoding.codegen.utils - * @description: 代码生成器 工具类 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:27 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:27 */ @Slf4j @UtilityClass @@ -412,4 +407,4 @@ public class CodeGenUtil { - [基于人人开源 自动构建项目_V1](https://qq343509740.gitee.io/2018/12/20/%E7%AC%94%E8%AE%B0/%E8%87%AA%E5%8A%A8%E6%9E%84%E5%BB%BA%E9%A1%B9%E7%9B%AE/%E5%9F%BA%E4%BA%8E%E4%BA%BA%E4%BA%BA%E5%BC%80%E6%BA%90%20%E8%87%AA%E5%8A%A8%E6%9E%84%E5%BB%BA%E9%A1%B9%E7%9B%AE_V1/) -- [Mybatis-Plus代码生成器](https://mybatis.plus/guide/generator.html#%E6%B7%BB%E5%8A%A0%E4%BE%9D%E8%B5%96) \ No newline at end of file +- [Mybatis-Plus代码生成器](https://mybatis.plus/guide/generator.html#%E6%B7%BB%E5%8A%A0%E4%BE%9D%E8%B5%96) diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java b/demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java index db828a7cf..6d3b11898 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/SpringBootDemoCodegenApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.codegen - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:10 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:10 */ @SpringBootApplication public class SpringBootDemoCodegenApplication { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java index 4f1c20f38..d2b1108d4 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/common/IResultCode.java @@ -5,13 +5,8 @@ * 统一状态码接口 *

* - * @package: com.xkcoding.rbac.shiro.common - * @description: 统一状态码接口 - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:28 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:28 */ public interface IResultCode { /** diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java index b06bfd369..f05de4aa3 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/common/PageResult.java @@ -10,13 +10,8 @@ * 分页结果集 *

* - * @package: com.xkcoding.codegen.common - * @description: 分页结果集 - * @author: yangkai.shen - * @date: Created in 2019-03-22 11:24 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 11:24 */ @Data @AllArgsConstructor diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java index 3a9cceb83..af2a33856 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/common/R.java @@ -8,13 +8,8 @@ * 统一API对象返回 *

* - * @package: com.xkcoding.codegen.common - * @description: 统一API对象返回 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:13 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:13 */ @Data @NoArgsConstructor diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java b/demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java index 3de00ad04..5f06f3eec 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/common/ResultCode.java @@ -7,13 +7,8 @@ * 通用状态枚举 *

* - * @package: com.xkcoding.codegen.common - * @description: 通用状态枚举 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:13 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:13 */ @Getter public enum ResultCode implements IResultCode { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java b/demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java index 599373ba2..6959cbc3f 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/constants/GenConstants.java @@ -5,13 +5,8 @@ * 常量池 *

* - * @package: com.xkcoding.codegen.constants - * @description: 常量池 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:04 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:04 */ public interface GenConstants { /** diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java b/demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java index 841ea4de5..879e546d9 100755 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/controller/CodeGenController.java @@ -17,13 +17,8 @@ * 代码生成器 *

* - * @package: com.xkcoding.codegen.controller - * @description: 代码生成器 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:11 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:11 */ @RestController @AllArgsConstructor diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java index a2a0bb37b..1c1e1aa05 100755 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/ColumnEntity.java @@ -7,13 +7,8 @@ * 列属性: https://blog.csdn.net/lkforce/article/details/79557482 *

* - * @package: com.xkcoding.codegen.entity - * @description: 列属性: https://blog.csdn.net/lkforce/article/details/79557482 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:46 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:46 */ @Data public class ColumnEntity { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java index 7e1cd0c17..107d1364a 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/GenConfig.java @@ -7,13 +7,8 @@ * 生成配置 *

* - * @package: com.xkcoding.codegen.entity - * @description: 生成配置 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:47 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:47 */ @Data public class GenConfig { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java index 4786726ee..1feb7c2db 100755 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableEntity.java @@ -9,13 +9,8 @@ * 表属性: https://blog.csdn.net/lkforce/article/details/79557482 *

* - * @package: com.xkcoding.codegen.entity - * @description: 表属性: https://blog.csdn.net/lkforce/article/details/79557482 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:47 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:47 */ @Data public class TableEntity { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java index 7f086c25a..f091c7fb8 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/entity/TableRequest.java @@ -7,13 +7,8 @@ * 表格请求参数 *

* - * @package: com.xkcoding.codegen.entity - * @description: 表格请求参数 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:24 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:24 */ @Data public class TableRequest { diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java b/demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java index 7123db87e..c71af32c1 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/service/CodeGenService.java @@ -10,13 +10,8 @@ * 代码生成器 *

* - * @package: com.xkcoding.codegen.service - * @description: 代码生成器 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:15 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:15 */ public interface CodeGenService { /** diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java b/demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java index 818278e75..b39bd1908 100755 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/service/impl/CodeGenServiceImpl.java @@ -26,13 +26,8 @@ * 代码生成器 *

* - * @package: com.xkcoding.codegen.service.impl - * @description: 代码生成器 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:15 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:15 */ @Service @AllArgsConstructor diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java index ef11a63ce..248747e59 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java @@ -31,13 +31,8 @@ * 代码生成器 工具类 *

* - * @package: com.xkcoding.codegen.utils - * @description: 代码生成器 工具类 - * @author: yangkai.shen - * @date: Created in 2019-03-22 09:27 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 09:27 */ @Slf4j @UtilityClass diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java index 2d6fb692e..17503cca1 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/DbUtil.java @@ -10,13 +10,8 @@ * 数据库工具类 *

* - * @package: com.xkcoding.codegen.utils - * @description: 数据库工具类 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:26 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:26 */ @Slf4j @UtilityClass diff --git a/demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js b/demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js index 68c2c43ff..1fa0daaa8 100644 --- a/demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js +++ b/demo-codegen/src/main/resources/static/libs/datejs/date-zh-CN.js @@ -1,9 +1,9 @@ /** * @version: 1.0 Alpha-1 - * @author: Coolite Inc. http://www.coolite.com/ + * @author Coolite Inc. http://www.coolite.com/ * @date: 2008-05-13 * @copyright: Copyright (c) 2006-2008, Coolite Inc. (http://www.coolite.com/). All rights reserved. - * @license: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. + * @license: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. * @website: http://www.datejs.com/ */ Date.CultureInfo={name:"zh-CN",englishName:"Chinese (People's Republic of China)",nativeName:"中文(中华人民共和国)",dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],abbreviatedDayNames:["日","一","二","三","四","五","六"],shortestDayNames:["日","一","二","三","四","五","六"],firstLetterDayNames:["日","一","二","三","四","五","六"],monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],abbreviatedMonthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],amDesignator:"上午",pmDesignator:"下午",firstDayOfWeek:0,twoDigitYearMax:2029,dateElementOrder:"ymd",formatPatterns:{shortDate:"yyyy/M/d",longDate:"yyyy'年'M'月'd'日'",shortTime:"H:mm",longTime:"H:mm:ss",fullDateTime:"yyyy'年'M'月'd'日' H:mm:ss",sortableDateTime:"yyyy-MM-ddTHH:mm:ss",universalSortableDateTime:"yyyy-MM-dd HH:mm:ssZ",rfc1123:"ddd, dd MMM yyyy HH:mm:ss GMT",monthDay:"M'月'd'日'",yearMonth:"yyyy'年'M'月'"},regexPatterns:{jan:/^一月/i,feb:/^二月/i,mar:/^三月/i,apr:/^四月/i,may:/^五月/i,jun:/^六月/i,jul:/^七月/i,aug:/^八月/i,sep:/^九月/i,oct:/^十月/i,nov:/^十一月/i,dec:/^十二月/i,sun:/^星期日/i,mon:/^星期一/i,tue:/^星期二/i,wed:/^星期三/i,thu:/^星期四/i,fri:/^星期五/i,sat:/^星期六/i,future:/^next/i,past:/^last|past|prev(ious)?/i,add:/^(\+|aft(er)?|from|hence)/i,subtract:/^(\-|bef(ore)?|ago)/i,yesterday:/^yes(terday)?/i,today:/^t(od(ay)?)?/i,tomorrow:/^tom(orrow)?/i,now:/^n(ow)?/i,millisecond:/^ms|milli(second)?s?/i,second:/^sec(ond)?s?/i,minute:/^mn|min(ute)?s?/i,hour:/^h(our)?s?/i,week:/^w(eek)?s?/i,month:/^m(onth)?s?/i,day:/^d(ay)?s?/i,year:/^y(ear)?s?/i,shortMeridian:/^(a|p)/i,longMeridian:/^(a\.?m?\.?|p\.?m?\.?)/i,timezone:/^((e(s|d)t|c(s|d)t|m(s|d)t|p(s|d)t)|((gmt)?\s*(\+|\-)\s*\d\d\d\d?)|gmt|utc)/i,ordinalSuffix:/^\s*(st|nd|rd|th)/i,timeContext:/^\s*(\:|a(?!u|p)|p)/i},timezones:[{name:"UTC",offset:"-000"},{name:"GMT",offset:"-000"},{name:"EST",offset:"-0500"},{name:"EDT",offset:"-0400"},{name:"CST",offset:"-0600"},{name:"CDT",offset:"-0500"},{name:"MST",offset:"-0700"},{name:"MDT",offset:"-0600"},{name:"PST",offset:"-0800"},{name:"PDT",offset:"-0700"}]}; diff --git a/demo-codegen/src/main/resources/template/Controller.java.vm b/demo-codegen/src/main/resources/template/Controller.java.vm index 36420dba2..5960e20d1 100755 --- a/demo-codegen/src/main/resources/template/Controller.java.vm +++ b/demo-codegen/src/main/resources/template/Controller.java.vm @@ -17,13 +17,8 @@ import lombok.extern.slf4j.Slf4j; * ${comments} *

* - * @package: ${package}.${moduleName}.controller - * @description: ${comments} - * @author: ${author} - * @date: Created in ${datetime} - * @copyright: Copyright (c) ${year} - * @version: V1.0 - * @modified: ${author} + * @author ${author} + * @date Created in ${datetime} */ @Slf4j @RestController diff --git a/demo-codegen/src/main/resources/template/Entity.java.vm b/demo-codegen/src/main/resources/template/Entity.java.vm index ddf3bf0ac..fd2c00498 100755 --- a/demo-codegen/src/main/resources/template/Entity.java.vm +++ b/demo-codegen/src/main/resources/template/Entity.java.vm @@ -17,13 +17,8 @@ import lombok.NoArgsConstructor; * ${comments} *

* - * @package: ${package}.${moduleName}.entity - * @description: ${comments} - * @author: ${author} - * @date: Created in ${datetime} - * @copyright: Copyright (c) ${year} - * @version: V1.0 - * @modified: ${author} + * @author ${author} + * @date Created in ${datetime} */ @Data @NoArgsConstructor diff --git a/demo-codegen/src/main/resources/template/Mapper.java.vm b/demo-codegen/src/main/resources/template/Mapper.java.vm index 7415cb8cb..f43178f51 100755 --- a/demo-codegen/src/main/resources/template/Mapper.java.vm +++ b/demo-codegen/src/main/resources/template/Mapper.java.vm @@ -9,13 +9,8 @@ import ${package}.${moduleName}.entity.${className}; * ${comments} *

* - * @package: ${package}.${moduleName}.mapper - * @description: ${comments} - * @author: ${author} - * @date: Created in ${datetime} - * @copyright: Copyright (c) ${year} - * @version: V1.0 - * @modified: ${author} + * @author ${author} + * @date Created in ${datetime} */ @Component public interface ${className}Mapper extends BaseMapper<${className}> { diff --git a/demo-codegen/src/main/resources/template/Service.java.vm b/demo-codegen/src/main/resources/template/Service.java.vm index 028598fa6..c84c7ecc1 100755 --- a/demo-codegen/src/main/resources/template/Service.java.vm +++ b/demo-codegen/src/main/resources/template/Service.java.vm @@ -8,13 +8,8 @@ import ${package}.${moduleName}.entity.${className}; * ${comments} *

* - * @package: ${package}.${moduleName}.service - * @description: ${comments} - * @author: ${author} - * @date: Created in ${datetime} - * @copyright: Copyright (c) ${year} - * @version: V1.0 - * @modified: ${author} + * @author ${author} + * @date Created in ${datetime} */ public interface ${className}Service extends IService<${className}> { diff --git a/demo-codegen/src/main/resources/template/ServiceImpl.java.vm b/demo-codegen/src/main/resources/template/ServiceImpl.java.vm index 56290b3ac..01a881d90 100755 --- a/demo-codegen/src/main/resources/template/ServiceImpl.java.vm +++ b/demo-codegen/src/main/resources/template/ServiceImpl.java.vm @@ -11,13 +11,8 @@ import lombok.extern.slf4j.Slf4j; * ${comments} *

* - * @package: ${package}.${moduleName}.service.impl - * @description: ${comments} - * @author: ${author} - * @date: Created in ${datetime} - * @copyright: Copyright (c) ${year} - * @version: V1.0 - * @modified: ${author} + * @author ${author} + * @date Created in ${datetime} */ @Service @Slf4j diff --git a/demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java b/demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java index b249a2f5d..e11cb5d44 100644 --- a/demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java +++ b/demo-codegen/src/test/java/com/xkcoding/codegen/CodeGenServiceTest.java @@ -23,13 +23,8 @@ * 代码生成service测试 *

* - * @package: com.xkcoding.codegen - * @description: 代码生成service测试 - * @author: yangkai.shen - * @date: Created in 2019-03-22 10:34 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-22 10:34 */ @RunWith(SpringRunner.class) @SpringBootTest diff --git a/demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java b/demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java index 9f707bd9b..c1a40046d 100644 --- a/demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java +++ b/demo-docker/src/main/java/com/xkcoding/docker/SpringBootDemoDockerApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.docker - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-11-29 14:59 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 14:59 */ @SpringBootApplication public class SpringBootDemoDockerApplication { diff --git a/demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java b/demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java index 04884fca2..a8b0d399d 100644 --- a/demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java +++ b/demo-docker/src/main/java/com/xkcoding/docker/controller/HelloController.java @@ -9,13 +9,8 @@ * Hello Controller *

* - * @package: com.xkcoding.docker.controller - * @description: Hello Controller - * @author: yangkai.shen - * @date: Created in 2018-11-29 14:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 14:58 */ @RestController @RequestMapping diff --git a/demo-dubbo/dubbo-common/README.md b/demo-dubbo/dubbo-common/README.md index a9bd5cea3..a44f8f92c 100644 --- a/demo-dubbo/dubbo-common/README.md +++ b/demo-dubbo/dubbo-common/README.md @@ -27,7 +27,7 @@ spring-boot-demo-dubbo-common - + ``` @@ -39,13 +39,8 @@ * Hello服务接口 *

* - * @package: com.xkcoding.dubbo.common.service - * @description: Hello服务接口 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:56 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:56 */ public interface HelloService { /** diff --git a/demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java b/demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java index 97044436c..9b52d750b 100644 --- a/demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java +++ b/demo-dubbo/dubbo-common/src/main/java/com/xkcoding/dubbo/common/service/HelloService.java @@ -5,13 +5,8 @@ * Hello服务接口 *

* - * @package: com.xkcoding.dubbo.common.service - * @description: Hello服务接口 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:56 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:56 */ public interface HelloService { /** diff --git a/demo-dubbo/dubbo-consumer/README.md b/demo-dubbo/dubbo-consumer/README.md index 975477192..6ff76e0f7 100644 --- a/demo-dubbo/dubbo-consumer/README.md +++ b/demo-dubbo/dubbo-consumer/README.md @@ -91,13 +91,8 @@ spring: * 启动器 *

* - * @package: com.xkcoding.dubbo.consumer - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:49 */ @SpringBootApplication @EnableDubboConfiguration @@ -117,13 +112,8 @@ public class SpringBootDemoDubboConsumerApplication { * Hello服务API *

* - * @package: com.xkcoding.dubbo.consumer.controller - * @description: Hello服务API - * @author: yangkai.shen - * @date: Created in 2018-12-25 17:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 17:22 */ @RestController @Slf4j @@ -137,4 +127,4 @@ public class HelloController { return helloService.sayHello(name); } } -``` \ No newline at end of file +``` diff --git a/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java index ae160001e..68a5e619b 100644 --- a/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java +++ b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/SpringBootDemoDubboConsumerApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.dubbo.consumer - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:49 */ @SpringBootApplication @EnableDubboConfiguration diff --git a/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java index 67bcd9e7e..026032ee4 100644 --- a/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java +++ b/demo-dubbo/dubbo-consumer/src/main/java/com/xkcoding/dubbo/consumer/controller/HelloController.java @@ -12,13 +12,8 @@ * Hello服务API *

* - * @package: com.xkcoding.dubbo.consumer.controller - * @description: Hello服务API - * @author: yangkai.shen - * @date: Created in 2018-12-25 17:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 17:22 */ @RestController @Slf4j diff --git a/demo-dubbo/dubbo-provider/README.md b/demo-dubbo/dubbo-provider/README.md index bcbb11e47..a6b177462 100644 --- a/demo-dubbo/dubbo-provider/README.md +++ b/demo-dubbo/dubbo-provider/README.md @@ -91,13 +91,8 @@ spring: * 启动器 *

* - * @package: com.xkcoding.dubbo.provider - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:49 */ @EnableDubboConfiguration @SpringBootApplication @@ -117,13 +112,8 @@ public class SpringBootDemoDubboProviderApplication { * Hello服务实现 *

* - * @package: com.xkcoding.dubbo.provider.service - * @description: Hello服务实现 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:58 */ @Service @Component diff --git a/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java index 4a407d227..c34b5de27 100644 --- a/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java +++ b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/SpringBootDemoDubboProviderApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.dubbo.provider - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:49 */ @EnableDubboConfiguration @SpringBootApplication diff --git a/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java index 7824e7181..9a69537d1 100644 --- a/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java +++ b/demo-dubbo/dubbo-provider/src/main/java/com/xkcoding/dubbo/provider/service/HelloServiceImpl.java @@ -10,13 +10,8 @@ * Hello服务实现 *

* - * @package: com.xkcoding.dubbo.provider.service - * @description: Hello服务实现 - * @author: yangkai.shen - * @date: Created in 2018-12-25 16:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-25 16:58 */ @Service @Component diff --git a/demo-dynamic-datasource/README.md b/demo-dynamic-datasource/README.md index f6f1c256e..7c0e2b7aa 100644 --- a/demo-dynamic-datasource/README.md +++ b/demo-dynamic-datasource/README.md @@ -99,7 +99,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 10:27 + * @date Created in 2019-09-04 10:27 */ @Configuration public class DatasourceConfiguration { @@ -125,7 +125,7 @@ public class DatasourceConfiguration { *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:20 + * @date Created in 2019-09-04 16:20 */ @Configuration @MapperScan(basePackages = "com.xkcoding.dynamicdatasource.mapper", sqlSessionFactoryRef = "sqlSessionFactory") @@ -159,7 +159,7 @@ public class MybatisConfiguration { *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:16 + * @date Created in 2019-09-04 14:16 */ public class DatasourceConfigContextHolder { private static final ThreadLocal DATASOURCE_HOLDER = ThreadLocal.withInitial(() -> DatasourceHolder.DEFAULT_ID); @@ -204,7 +204,7 @@ public class DatasourceConfigContextHolder { *

* * @author yangkai.shen - * @date Created in 2019/9/4 10:41 + * @date Created in 2019-09-04 10:41 */ @Slf4j public class DynamicDataSource extends HikariDataSource { @@ -269,7 +269,7 @@ public class DynamicDataSource extends HikariDataSource { *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:42 + * @date Created in 2019-09-04 14:42 */ public enum DatasourceScheduler { /** @@ -313,7 +313,7 @@ public enum DatasourceScheduler { *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:27 + * @date Created in 2019-09-04 14:27 */ public class DatasourceManager { /** @@ -370,7 +370,7 @@ public class DatasourceManager { *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:23 + * @date Created in 2019-09-04 14:23 */ public enum DatasourceHolder { /** @@ -461,7 +461,7 @@ public enum DatasourceHolder { *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:13 + * @date Created in 2019-09-04 17:13 */ public enum DatasourceConfigCache { /** @@ -519,7 +519,7 @@ public enum DatasourceConfigCache { *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:57 + * @date Created in 2019-09-04 17:57 */ @SpringBootApplication @RequiredArgsConstructor(onConstructor_ = @Autowired) @@ -571,7 +571,7 @@ public class SpringBootDemoDynamicDatasourceApplication implements CommandLineRu > > - DELETE http://localhost:8080/config/{id} > -> 新增数据源: +> 新增数据源: > > - POST http://localhost:8080/config > @@ -600,7 +600,7 @@ public class SpringBootDemoDynamicDatasourceApplication implements CommandLineRu *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:52 + * @date Created in 2019-09-04 16:52 */ @Aspect @Component @@ -657,7 +657,7 @@ public class DatasourceSelectorAspect { *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:37 + * @date Created in 2019-09-04 17:37 */ @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @@ -666,4 +666,4 @@ public @interface DefaultDatasource { } ``` -完结,撒花✿✿ヽ(°▽°)ノ✿ \ No newline at end of file +完结,撒花✿✿ヽ(°▽°)ノ✿ diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java index 7a84a968d..ef3b5e3f0 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/SpringBootDemoDynamicDatasourceApplication.java @@ -18,7 +18,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:57 + * @date Created in 2019-09-04 17:57 */ @SpringBootApplication @RequiredArgsConstructor(onConstructor_ = @Autowired) diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java index 533b20a05..2194e1e41 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/annotation/DefaultDatasource.java @@ -8,7 +8,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:37 + * @date Created in 2019-09-04 17:37 */ @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java index 13da69116..909379b0e 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/aspect/DatasourceSelectorAspect.java @@ -26,7 +26,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:52 + * @date Created in 2019-09-04 16:52 */ @Aspect @Component diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java index 150ac649f..b006fa7be 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/DatasourceConfiguration.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 10:27 + * @date Created in 2019-09-04 10:27 */ @Configuration public class DatasourceConfiguration { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java index 24105815d..13700d367 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MyMapper.java @@ -10,7 +10,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:23 + * @date Created in 2019-09-04 16:23 */ @RegisterMapper public interface MyMapper extends Mapper, MySqlMapper { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java index 4747ac78f..5ac0b47c4 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/config/MybatisConfiguration.java @@ -16,7 +16,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:20 + * @date Created in 2019-09-04 16:20 */ @Configuration @MapperScan(basePackages = "com.xkcoding.dynamic.datasource.mapper", sqlSessionFactoryRef = "sqlSessionFactory") diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java index 83bae721e..b6a0cd303 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/DatasourceConfigController.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:31 + * @date Created in 2019-09-04 17:31 */ @RestController @RequiredArgsConstructor(onConstructor_ = @Autowired) diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java index 67ce6a975..5802bf04e 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/controller/UserController.java @@ -15,7 +15,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:40 + * @date Created in 2019-09-04 16:40 */ @RestController @RequiredArgsConstructor(onConstructor_ = @Autowired) diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java index 51324c459..cd834bc1c 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigCache.java @@ -11,7 +11,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 17:13 + * @date Created in 2019-09-04 17:13 */ public enum DatasourceConfigCache { /** diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java index 389441f4d..59db7819d 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceConfigContextHolder.java @@ -6,7 +6,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:16 + * @date Created in 2019-09-04 14:16 */ public class DatasourceConfigContextHolder { private static final ThreadLocal DATASOURCE_HOLDER = ThreadLocal.withInitial(() -> DatasourceHolder.DEFAULT_ID); diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java index f1ab5b938..dc873a564 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java @@ -11,7 +11,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:23 + * @date Created in 2019-09-04 14:23 */ public enum DatasourceHolder { /** diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java index ea57f4198..de4695376 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceManager.java @@ -11,7 +11,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:27 + * @date Created in 2019-09-04 14:27 */ public class DatasourceManager { /** diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java index f8a493950..e8ed62f15 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java @@ -11,7 +11,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 14:42 + * @date Created in 2019-09-04 14:42 */ public enum DatasourceScheduler { /** diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java index c32bfdcf0..f91c56345 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java @@ -15,7 +15,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 10:41 + * @date Created in 2019-09-04 10:41 */ @Slf4j public class DynamicDataSource extends HikariDataSource { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java index 544e31f46..a842e5337 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/DatasourceConfigMapper.java @@ -10,7 +10,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:20 + * @date Created in 2019-09-04 16:20 */ @Mapper public interface DatasourceConfigMapper extends MyMapper { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java index 02ac04bec..a0b7b45e2 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/mapper/UserMapper.java @@ -10,7 +10,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:49 + * @date Created in 2019-09-04 16:49 */ @Mapper public interface UserMapper extends MyMapper { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java index 5477a9416..fc69d4574 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/DatasourceConfig.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 10:58 + * @date Created in 2019-09-04 10:58 */ @Data @Table(name = "datasource_config") diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java index 0c2907790..e7249d744 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/model/User.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:41 + * @date Created in 2019-09-04 16:41 */ @Data @Table(name = "test_user") diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java index a1fb444c2..a718417fb 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/utils/SpringUtil.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/4 16:16 + * @date Created in 2019-09-04 16:16 */ @Slf4j @Service diff --git a/demo-elasticsearch-rest-high-level-client/README.md b/demo-elasticsearch-rest-high-level-client/README.md index 6105afef7..b0e631df9 100644 --- a/demo-elasticsearch-rest-high-level-client/README.md +++ b/demo-elasticsearch-rest-high-level-client/README.md @@ -1,6 +1,6 @@ # spring-boot-demo-elasticsearch-rest-high-level-client -> 此 demo 主要演示了 Spring Boot 如何集成 `elasticsearch-rest-high-level-client` 完成对 `ElasticSearch 7.x` 版本的基本 CURD 操作 +> 此 demo 主要演示了 Spring Boot 如何集成 `elasticsearch-rest-high-level-client` 完成对 `ElasticSearch 7.x` 版本的基本 CURD 操作 ## Elasticsearch 升级 @@ -36,7 +36,7 @@ services: - "/data/es7/logs:/usr/share/es7/logs:rw" - "/data/es7/data:/usr/share/es7/data:rw" restart: on-failure - ports: + ports: - "9200:9200" - "9300:9300" environment: @@ -184,7 +184,7 @@ import java.util.Date; * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:04 + * @since 2019-09-15 23:04 */ @Data @Builder @@ -242,7 +242,7 @@ import java.util.List; * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:07 + * @since 2019-09-15 23:07 */ public interface PersonService { @@ -328,7 +328,7 @@ import java.util.Map; * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:08 + * @since 2019-09-15 23:08 */ @Service public class PersonServiceImpl extends BaseElasticsearchService implements PersonService { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java index 2b860f437..38969eea0 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/ElasticsearchApplication.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:10 + * @since 2019-09-15 23:10 */ @SpringBootApplication public class ElasticsearchApplication { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java index 2ae2af944..e9a073285 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java @@ -10,7 +10,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:44 + * @since 2019-08-26 1:44 */ @Data public class Result implements Serializable { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java index 9f561375a..87c335948 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/ResultCode.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:47 + * @since 2019-08-26 1:47 */ @Getter @AllArgsConstructor diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java index ea1877a7f..228b09ba7 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchAutoConfiguration.java @@ -25,7 +25,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 22:59 + * @since 2019-09-15 22:59 */ @Configuration @RequiredArgsConstructor(onConstructor_ = @Autowired) diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java index ee5db8667..e8a4e151a 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/config/ElasticsearchProperties.java @@ -16,7 +16,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 22:58 + * @since 2019-09-15 22:58 */ @Data @Builder diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java index 4a989e328..b1eb64a46 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/contants/ElasticsearchConstant.java @@ -5,7 +5,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:03 + * @since 2019-09-15 23:03 */ public interface ElasticsearchConstant { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java index ca92416d0..54d597a07 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/exception/ElasticsearchException.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:53 + * @since 2019-08-26 1:53 */ public class ElasticsearchException extends RuntimeException { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java index d6c59cbe7..4a5cdcfb4 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/model/Person.java @@ -13,7 +13,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:04 + * @since 2019-09-15 23:04 */ @Data @Builder diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java index 0ffba432a..d37bd142c 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java @@ -10,7 +10,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:07 + * @since 2019-09-15 23:07 */ public interface PersonService { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java index fa919beab..7a0d6b575 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/base/BaseElasticsearchService.java @@ -28,7 +28,7 @@ * * @author fxbin * @version 1.0v - * @since 2019/9/16 15:44 + * @since 2019-09-16 15:44 */ @Slf4j public abstract class BaseElasticsearchService { diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java index 5e9cecaeb..f5d77b08d 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java @@ -21,7 +21,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/9/15 23:08 + * @since 2019-09-15 23:08 */ @Service public class PersonServiceImpl extends BaseElasticsearchService implements PersonService { diff --git a/demo-elasticsearch/README.md b/demo-elasticsearch/README.md index ae2cf7f8d..67bb95689 100644 --- a/demo-elasticsearch/README.md +++ b/demo-elasticsearch/README.md @@ -10,7 +10,7 @@ 2. 运行容器:`docker run -d -p 9200:9200 -p 9300:9300 --name elasticsearch-6.5.3 elasticsearch:6.5.3` -3. 进入容器:`docker exec -it elasticsearch-6.5.3 /bin/bash` +3. 进入容器:`docker exec -it elasticsearch-6.5.3 /bin/bash` 4. 安装 ik 分词器:`./bin/elasticsearch-plugin install https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v6.5.3/elasticsearch-analysis-ik-6.5.3.zip` @@ -19,12 +19,12 @@ ```yaml cluster.name: "docker-cluster" network.host: 0.0.0.0 - + # minimum_master_nodes need to be explicitly set when bound on a public IP # set to 1 to allow single node clusters # Details: https://github.com/elastic/elasticsearch/pull/17288 discovery.zen.minimum_master_nodes: 1 - + # just for elasticsearch-head plugin http.cors.enabled: true http.cors.allow-origin: "*" @@ -124,13 +124,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.elasticsearch.model - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018-12-20 17:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 17:29 */ @Document(indexName = EsConsts.INDEX_NAME, type = EsConsts.TYPE_NAME, shards = 1, replicas = 0) @Data @@ -183,13 +178,8 @@ public class Person { * 用户持久层 *

* - * @package: com.xkcoding.elasticsearch.repository - * @description: 用户持久层 - * @author: yangkai.shen - * @date: Created in 2018-12-20 19:00 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 19:00 */ public interface PersonRepository extends ElasticsearchRepository { @@ -214,13 +204,8 @@ public interface PersonRepository extends ElasticsearchRepository * 测试 ElasticTemplate 的创建/删除 *

* - * @package: com.xkcoding.elasticsearch.template - * @description: 测试 ElasticTemplate 的创建/删除 - * @author: yangkai.shen - * @date: Created in 2018-12-20 17:46 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 17:46 */ public class TemplateTest extends SpringBootDemoElasticsearchApplicationTests { @Autowired @@ -258,13 +243,8 @@ public class TemplateTest extends SpringBootDemoElasticsearchApplicationTests { * 测试 Repository 操作ES *

* - * @package: com.xkcoding.elasticsearch.repository - * @description: 测试 Repository 操作ES - * @author: yangkai.shen - * @date: Created in 2018-12-20 19:03 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 19:03 */ @Slf4j public class PersonRepositoryTest extends SpringBootDemoElasticsearchApplicationTests { diff --git a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java index 12218b71d..260128482 100644 --- a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java +++ b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.elasticsearch - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/27 22:52 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-27 22:52 */ @SpringBootApplication public class SpringBootDemoElasticsearchApplication { diff --git a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java index 7753b45b8..a67f42f03 100644 --- a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java +++ b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/constants/EsConsts.java @@ -5,13 +5,8 @@ * ES常量池 *

* - * @package: com.xkcoding.elasticsearch.constants - * @description: ES常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-20 17:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 17:30 */ public interface EsConsts { /** diff --git a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java index 614af611b..1d6f8a620 100644 --- a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java +++ b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/model/Person.java @@ -16,13 +16,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.elasticsearch.model - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018-12-20 17:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 17:29 */ @Document(indexName = EsConsts.INDEX_NAME, type = EsConsts.TYPE_NAME, shards = 1, replicas = 0) @Data diff --git a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java index 5158d335f..49f44754d 100644 --- a/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java +++ b/demo-elasticsearch/src/main/java/com/xkcoding/elasticsearch/repository/PersonRepository.java @@ -10,13 +10,8 @@ * 用户持久层 *

* - * @package: com.xkcoding.elasticsearch.repository - * @description: 用户持久层 - * @author: yangkai.shen - * @date: Created in 2018-12-20 19:00 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 19:00 */ public interface PersonRepository extends ElasticsearchRepository { diff --git a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java index b62f19601..6a83ca437 100644 --- a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java +++ b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java @@ -29,13 +29,8 @@ * 测试 Repository 操作ES *

* - * @package: com.xkcoding.elasticsearch.repository - * @description: 测试 Repository 操作ES - * @author: yangkai.shen - * @date: Created in 2018-12-20 19:03 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 19:03 */ @Slf4j public class PersonRepositoryTest extends SpringBootDemoElasticsearchApplicationTests { @@ -194,4 +189,4 @@ public void advanceAgg() { } } -} \ No newline at end of file +} diff --git a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java index 4e95257be..6d53aa3ed 100644 --- a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java +++ b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/template/TemplateTest.java @@ -11,13 +11,8 @@ * 测试 ElasticTemplate 的创建/删除 *

* - * @package: com.xkcoding.elasticsearch.template - * @description: 测试 ElasticTemplate 的创建/删除 - * @author: yangkai.shen - * @date: Created in 2018-12-20 17:46 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-20 17:46 */ public class TemplateTest extends SpringBootDemoElasticsearchApplicationTests { @Autowired diff --git a/demo-email/README.md b/demo-email/README.md index 08e70dbaa..85d037e4d 100644 --- a/demo-email/README.md +++ b/demo-email/README.md @@ -83,7 +83,7 @@ spring: host: smtp.mxhichina.com port: 465 username: spring-boot-demo@xkcoding.com - # 使用 jasypt 加密密码,使用com.xkcoding.email.PasswordTest.testGeneratePassword 生成加密密码,替换 ENC(加密密码) + # 使用 jasypt 加密密码,使用com.xkcoding.email.PasswordTest.testGeneratePassword 生成加密密码,替换 ENC(加密密码) password: ENC(OT0qGOpXrr1Iog1W+fjOiIDCJdBjHyhy) protocol: smtp test-connection: true @@ -109,13 +109,8 @@ jasypt: * 邮件接口 *

* - * @package: com.xkcoding.email.service - * @description: 邮件接口 - * @author: yangkai.shen - * @date: Created in 2018/11/21 11:16 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 11:16 */ public interface MailService { /** @@ -164,7 +159,7 @@ public interface MailService { */ void sendResourceMail(String to, String subject, String content, String rscPath, String rscId, String... cc) throws MessagingException; -} +} ``` ## MailServiceImpl.java @@ -175,13 +170,8 @@ public interface MailService { * 邮件接口 *

* - * @package: com.xkcoding.email.service.impl - * @description: 邮件接口 - * @author: yangkai.shen - * @date: Created in 2018/11/21 13:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 13:49 */ @Service public class MailServiceImpl implements MailService { @@ -302,13 +292,8 @@ public class MailServiceImpl implements MailService { * 邮件测试 *

* - * @package: com.xkcoding.email.service - * @description: 邮件测试 - * @author: yangkai.shen - * @date: Created in 2018/11/21 13:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 13:49 */ public class MailServiceTest extends SpringBootDemoEmailApplicationTests { @Autowired @@ -453,4 +438,4 @@ public class MailServiceTest extends SpringBootDemoEmailApplicationTests { ## 参考 - Spring Boot 官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-email -- Spring Boot 官方文档:https://docs.spring.io/spring/docs/5.1.2.RELEASE/spring-framework-reference/integration.html#mail \ No newline at end of file +- Spring Boot 官方文档:https://docs.spring.io/spring/docs/5.1.2.RELEASE/spring-framework-reference/integration.html#mail diff --git a/demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java b/demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java index a02cd8cdc..9e054fae4 100644 --- a/demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java +++ b/demo-email/src/main/java/com/xkcoding/email/SpringBootDemoEmailApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.email - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/4 22:38 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-04 22:38 */ @SpringBootApplication public class SpringBootDemoEmailApplication { diff --git a/demo-email/src/main/java/com/xkcoding/email/service/MailService.java b/demo-email/src/main/java/com/xkcoding/email/service/MailService.java index 421d31051..b7e57643f 100644 --- a/demo-email/src/main/java/com/xkcoding/email/service/MailService.java +++ b/demo-email/src/main/java/com/xkcoding/email/service/MailService.java @@ -7,13 +7,8 @@ * 邮件接口 *

* - * @package: com.xkcoding.email.service - * @description: 邮件接口 - * @author: yangkai.shen - * @date: Created in 2018/11/21 11:16 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 11:16 */ public interface MailService { /** @@ -62,4 +57,4 @@ public interface MailService { */ void sendResourceMail(String to, String subject, String content, String rscPath, String rscId, String... cc) throws MessagingException; -} \ No newline at end of file +} diff --git a/demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java b/demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java index b9e7ec77d..59a8e13d2 100644 --- a/demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java +++ b/demo-email/src/main/java/com/xkcoding/email/service/impl/MailServiceImpl.java @@ -19,13 +19,8 @@ * 邮件接口 *

* - * @package: com.xkcoding.email.service.impl - * @description: 邮件接口 - * @author: yangkai.shen - * @date: Created in 2018/11/21 13:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 13:49 */ @Service public class MailServiceImpl implements MailService { diff --git a/demo-email/src/test/java/com/xkcoding/email/PasswordTest.java b/demo-email/src/test/java/com/xkcoding/email/PasswordTest.java index d6c0955f4..3f119e9e4 100644 --- a/demo-email/src/test/java/com/xkcoding/email/PasswordTest.java +++ b/demo-email/src/test/java/com/xkcoding/email/PasswordTest.java @@ -10,7 +10,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/8/27 16:15 + * @date Created in 2019-08-27 16:15 */ public class PasswordTest extends SpringBootDemoEmailApplicationTests { @Autowired diff --git a/demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java b/demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java index 52b7fd92c..b23d352bc 100644 --- a/demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java +++ b/demo-email/src/test/java/com/xkcoding/email/service/MailServiceTest.java @@ -17,13 +17,8 @@ * 邮件测试 *

* - * @package: com.xkcoding.email.service - * @description: 邮件测试 - * @author: yangkai.shen - * @date: Created in 2018/11/21 13:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-21 13:49 */ public class MailServiceTest extends SpringBootDemoEmailApplicationTests { @Autowired diff --git a/demo-exception-handler/README.md b/demo-exception-handler/README.md index 10d64bef8..040276f71 100644 --- a/demo-exception-handler/README.md +++ b/demo-exception-handler/README.md @@ -76,13 +76,8 @@ * 通用的 API 接口封装 *

* - * @package: com.xkcoding.exception.handler.model - * @description: 通用的 API 接口封装 - * @author: yangkai.shen - * @date: Created in 2018/10/2 8:57 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 20:57 */ @Data public class ApiResponse { @@ -207,13 +202,8 @@ public class ApiResponse { * 统一异常处理 *

* - * @package: com.xkcoding.exception.handler.handler - * @description: 统一异常处理 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:26 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:26 */ @ControllerAdvice @Slf4j diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java index ddab733d3..cc34a52ec 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.exception.handler - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/2 8:49 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 20:49 */ @SpringBootApplication public class SpringBootDemoExceptionHandlerApplication { diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java index da60aac75..b79a300c5 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java @@ -7,13 +7,8 @@ * 状态码封装 *

* - * @package: com.xkcoding.exception.handler.constant - * @description: 状态码封装 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:02 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:02 */ @Getter public enum Status { @@ -21,7 +16,7 @@ public enum Status { * 操作成功 */ OK(200, "操作成功"), - + /** * 未知异常 */ diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java index 48dd97507..94e124735 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java @@ -14,13 +14,8 @@ * 测试Controller *

* - * @package: com.xkcoding.exception.handler.controller - * @description: 测试Controller - * @author: yangkai.shen - * @date: Created in 2018/10/2 8:49 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 20:49 */ @Controller public class TestController { diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java index d4e037d28..5fd4541a7 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java @@ -9,13 +9,8 @@ * 异常基类 *

* - * @package: com.xkcoding.exception.handler.exception - * @description: 异常基类 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:31 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:31 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java index b72ddeff0..9fce44a79 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java @@ -8,13 +8,8 @@ * JSON异常 *

* - * @package: com.xkcoding.exception.handler.exception - * @description: JSON异常 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:18 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:18 */ @Getter public class JsonException extends BaseException { diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java index 102327ac7..9a92eae65 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java @@ -8,13 +8,8 @@ * 页面异常 *

* - * @package: com.xkcoding.exception.handler.exception - * @description: 页面异常 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:18 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:18 */ @Getter public class PageException extends BaseException { diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java index 191bd695b..19b1d79f0 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java @@ -14,13 +14,8 @@ * 统一异常处理 *

* - * @package: com.xkcoding.exception.handler.handler - * @description: 统一异常处理 - * @author: yangkai.shen - * @date: Created in 2018/10/2 9:26 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 21:26 */ @ControllerAdvice @Slf4j diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java index 4731ce885..7b028fde2 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java @@ -9,13 +9,8 @@ * 通用的 API 接口封装 *

* - * @package: com.xkcoding.exception.handler.model - * @description: 通用的 API 接口封装 - * @author: yangkai.shen - * @date: Created in 2018/10/2 8:57 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-02 20:57 */ @Data public class ApiResponse { diff --git a/demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java b/demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java index 7a300bc45..abc35f9ba 100644 --- a/demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java +++ b/demo-flyway/src/main/java/com/xkcoding/flyway/SpringBootDemoFlywayApplication.java @@ -9,7 +9,7 @@ *

* * @author yangkai.shen - * @date Created in 2020/3/4 18:30 + * @date Created in 2020-03-04 18:30 */ @SpringBootApplication public class SpringBootDemoFlywayApplication { diff --git a/demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java b/demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java index e5570ae8b..efb57c8d1 100644 --- a/demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java +++ b/demo-graylog/src/main/java/com/xkcoding/graylog/SpringBootDemoGraylogApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.graylog - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-04-23 09:43 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-04-23 09:43 */ @SpringBootApplication public class SpringBootDemoGraylogApplication { diff --git a/demo-helloworld/README.md b/demo-helloworld/README.md index 1e42f538b..d0c5cd859 100644 --- a/demo-helloworld/README.md +++ b/demo-helloworld/README.md @@ -73,13 +73,8 @@ * SpringBoot启动类 *

* - * @package: com.xkcoding.helloworld - * @description: SpringBoot启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/28 2:49 PM - * @copyright: Copyright (c) - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-28 14:49 */ @SpringBootApplication @RestController diff --git a/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java b/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java index b71825cac..90433cb3d 100644 --- a/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java +++ b/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java @@ -12,13 +12,8 @@ * SpringBoot启动类 *

* - * @package: com.xkcoding.helloworld - * @description: SpringBoot启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/28 2:49 PM - * @copyright: Copyright (c) - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-28 14:49 */ @SpringBootApplication @RestController diff --git a/demo-https/README.md b/demo-https/README.md index c2078b05a..042cb6f64 100644 --- a/demo-https/README.md +++ b/demo-https/README.md @@ -37,7 +37,7 @@ server: *

* * @author yangkai.shen - * @date Created in 2020/1/19 10:31 + * @date Created in 2020-01-19 10:31 */ @Configuration public class HttpsConfig { @@ -107,4 +107,4 @@ $ keytool --help 使用 "keytool -command_name -help" 获取 command_name 的用法 ``` -- [Java Keytool工具简介](https://blog.csdn.net/liumiaocn/article/details/61921014) \ No newline at end of file +- [Java Keytool工具简介](https://blog.csdn.net/liumiaocn/article/details/61921014) diff --git a/demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java b/demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java index 8a960690e..2f7dd0a94 100644 --- a/demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java +++ b/demo-https/src/main/java/com/xkcoding/https/SpringBootDemoHttpsApplication.java @@ -9,7 +9,7 @@ *

* * @author Chen.Chao - * @date Created in 2020/1/12 10:31 + * @date Created in 2020-01-12 10:31 */ @SpringBootApplication public class SpringBootDemoHttpsApplication { diff --git a/demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java b/demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java index 3d8b9a39a..239227a3a 100644 --- a/demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java +++ b/demo-https/src/main/java/com/xkcoding/https/config/HttpsConfig.java @@ -14,7 +14,7 @@ *

* * @author Chen.Chao - * @date Created in 2020/1/12 10:31 + * @date Created in 2020-01-12 10:31 */ @Configuration public class HttpsConfig { diff --git a/demo-ldap/README.md b/demo-ldap/README.md index 3dde0ad19..916df8c6e 100644 --- a/demo-ldap/README.md +++ b/demo-ldap/README.md @@ -84,14 +84,14 @@ spring: ## Person.java > 实体类 -> @Entry 注解 映射ldap对象关系 +> @Entry 注解 映射ldap对象关系 ```java /** * People * * @author fxbin * @version v1.0 - * @since 2019/8/26 0:51 + * @since 2019-08-26 0:51 */ @Data @Entry( @@ -167,7 +167,7 @@ public class Person implements Serializable { * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:02 + * @since 2019-08-26 1:02 */ @Repository public interface PersonRepository extends CrudRepository { @@ -190,7 +190,7 @@ public interface PersonRepository extends CrudRepository { * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:05 + * @since 2019-08-26 1:05 */ public interface PersonService { @@ -226,7 +226,7 @@ public interface PersonService { } ``` -## PersonServiceImpl.java +## PersonServiceImpl.java > person数据操作服务具体逻辑实现类 ```java @@ -235,7 +235,7 @@ public interface PersonService { * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:05 + * @since 2019-08-26 1:05 */ @Slf4j @Service @@ -305,7 +305,7 @@ public class PersonServiceImpl implements PersonService { personRepository.delete(person); log.info("删除用户{}成功", person.getUid()); } - + } ``` @@ -317,7 +317,7 @@ public class PersonServiceImpl implements PersonService { * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:06 + * @since 2019-08-26 1:06 */ @RunWith(SpringRunner.class) @SpringBootTest diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java b/demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java index f463f85ee..862f075c0 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/LdapDemoApplication.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 0:37 + * @since 2019-08-26 0:37 */ @SpringBootApplication public class LdapDemoApplication { diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java b/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java index 0e8aa401e..93da11a31 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java @@ -10,7 +10,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:44 + * @since 2019-08-26 1:44 */ @Data public class Result implements Serializable { diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java b/demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java index 621e875d4..4a40bb786 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/api/ResultCode.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:47 + * @since 2019-08-26 1:47 */ @Getter @AllArgsConstructor diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java b/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java index 38029b2db..49acfeef8 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java @@ -14,7 +14,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 0:51 + * @since 2019-08-26 0:51 */ @Data @Entry( diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java b/demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java index a600b2044..e84471af5 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/exception/ServiceException.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:53 + * @since 2019-08-26 1:53 */ public class ServiceException extends RuntimeException { diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java b/demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java index 89799f025..5939e2dff 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/repository/PersonRepository.java @@ -11,7 +11,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:02 + * @since 2019-08-26 1:02 */ @Repository public interface PersonRepository extends CrudRepository { diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java b/demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java index c1d238075..34bcafdbf 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/request/LoginRequest.java @@ -8,7 +8,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:50 + * @since 2019-08-26 1:50 */ @Data @Builder diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java b/demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java index bb4563267..c5a07becd 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/service/PersonService.java @@ -9,7 +9,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:05 + * @since 2019-08-26 1:05 */ public interface PersonService { diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java b/demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java index 363f65e06..05ee7aa06 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/service/impl/PersonServiceImpl.java @@ -20,7 +20,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:05 + * @since 2019-08-26 1:05 */ @Slf4j @Service diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java b/demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java index 606a5a831..5b9ede3f4 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/util/LdapUtils.java @@ -10,7 +10,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:03 + * @since 2019-08-26 1:03 */ public class LdapUtils { diff --git a/demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java b/demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java index 847e8bbfc..377a097ab 100644 --- a/demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java +++ b/demo-ldap/src/test/java/com/xkcoding/ldap/LdapDemoApplicationTests.java @@ -16,7 +16,7 @@ * * @author fxbin * @version v1.0 - * @since 2019/8/26 1:06 + * @since 2019-08-26 1:06 */ @RunWith(SpringRunner.class) @SpringBootTest diff --git a/demo-log-aop/README.md b/demo-log-aop/README.md index ec0073650..526a7da29 100644 --- a/demo-log-aop/README.md +++ b/demo-log-aop/README.md @@ -85,13 +85,8 @@ * 使用 aop 切面记录请求日志信息 *

* - * @package: com.xkcoding.log.aop.aspectj - * @description: 使用 aop 切面记录请求日志信息 - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:05 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:05 */ @Aspect @Component @@ -169,13 +164,8 @@ public class AopLog { * 测试 Controller *

* - * @package: com.xkcoding.log.aop.controller - * @description: 测试 Controller - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:10 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:10 */ @RestController public class TestController { diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java index 8240bccd6..485ce563b 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.log.aop - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:05 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:05 */ @SpringBootApplication public class SpringBootDemoLogAopApplication { diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java index 9caa8586f..92d2a8d0c 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java @@ -19,13 +19,8 @@ * 使用 aop 切面记录请求日志信息 *

* - * @package: com.xkcoding.log.aop.aspectj - * @description: 使用 aop 切面记录请求日志信息 - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:05 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:05 */ @Aspect @Component diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java index 8cff8c468..19292b3ff 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java @@ -10,13 +10,8 @@ * 测试 Controller *

* - * @package: com.xkcoding.log.aop.controller - * @description: 测试 Controller - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:10 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:10 */ @RestController public class TestController { diff --git a/demo-logback/README.md b/demo-logback/README.md index 32a8f70e6..d7d6988d5 100644 --- a/demo-logback/README.md +++ b/demo-logback/README.md @@ -69,13 +69,8 @@ * 启动类 *

* - * @package: com.xkcoding.logback - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/30 11:16 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-30 23:16 */ @SpringBootApplication @Slf4j diff --git a/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java b/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java index 43ed673ff..ba2f53c3a 100644 --- a/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java +++ b/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java @@ -10,13 +10,8 @@ * 启动类 *

* - * @package: com.xkcoding.logback - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/30 11:16 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-30 23:16 */ @SpringBootApplication @Slf4j diff --git a/demo-mongodb/README.md b/demo-mongodb/README.md index 390004e4f..2c6b85dc0 100644 --- a/demo-mongodb/README.md +++ b/demo-mongodb/README.md @@ -107,13 +107,8 @@ logging: * 文章实体类 *

* - * @package: com.xkcoding.mongodb.model - * @description: 文章实体类 - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:21 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:21 */ @Data @Builder @@ -167,13 +162,8 @@ public class Article { * 文章 Dao *

* - * @package: com.xkcoding.mongodb.repository - * @description: 文章 Dao - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:30 */ public interface ArticleRepository extends MongoRepository { /** @@ -194,13 +184,8 @@ public interface ArticleRepository extends MongoRepository { * 测试操作 MongoDb *

* - * @package: com.xkcoding.mongodb.repository - * @description: 测试操作 MongoDb - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:35 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:35 */ @Slf4j public class ArticleRepositoryTest extends SpringBootDemoMongodbApplicationTests { @@ -329,4 +314,4 @@ public class ArticleRepositoryTest extends SpringBootDemoMongodbApplicationTests 1. Spring Data MongoDB 官方文档:https://docs.spring.io/spring-data/mongodb/docs/2.1.2.RELEASE/reference/html/ 2. MongoDB 官方镜像地址:https://hub.docker.com/_/mongo 3. MongoDB 官方快速入门:https://docs.mongodb.com/manual/tutorial/getting-started/ -4. MongoDB 官方文档:https://docs.mongodb.com/manual/ \ No newline at end of file +4. MongoDB 官方文档:https://docs.mongodb.com/manual/ diff --git a/demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java index bf63ed5ae..8c6fd8be4 100644 --- a/demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java +++ b/demo-mongodb/src/main/java/com/xkcoding/mongodb/SpringBootDemoMongodbApplication.java @@ -11,13 +11,8 @@ * 启动器 *

* - * @package: com.xkcoding.mongodb - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:14 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:14 */ @SpringBootApplication public class SpringBootDemoMongodbApplication { diff --git a/demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java index 0922ce52d..1d7fcd596 100644 --- a/demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java +++ b/demo-mongodb/src/main/java/com/xkcoding/mongodb/model/Article.java @@ -13,13 +13,8 @@ * 文章实体类 *

* - * @package: com.xkcoding.mongodb.model - * @description: 文章实体类 - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:21 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:21 */ @Data @Builder diff --git a/demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java b/demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java index a0ca60cc8..341fd6297 100644 --- a/demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java +++ b/demo-mongodb/src/main/java/com/xkcoding/mongodb/repository/ArticleRepository.java @@ -10,13 +10,8 @@ * 文章 Dao *

* - * @package: com.xkcoding.mongodb.repository - * @description: 文章 Dao - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:30 */ public interface ArticleRepository extends MongoRepository { /** diff --git a/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java b/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java index e1c778eb6..1cf567d78 100644 --- a/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java +++ b/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java @@ -26,13 +26,8 @@ * 测试操作 MongoDb *

* - * @package: com.xkcoding.mongodb.repository - * @description: 测试操作 MongoDb - * @author: yangkai.shen - * @date: Created in 2018-12-28 16:35 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-28 16:35 */ @Slf4j public class ArticleRepositoryTest extends SpringBootDemoMongodbApplicationTests { @@ -153,4 +148,4 @@ public void testFindByTitleLike() { log.info("【articles】= {}", JSONUtil.toJsonStr(articles)); } -} \ No newline at end of file +} diff --git a/demo-mq-kafka/README.md b/demo-mq-kafka/README.md index 0c288929b..55b684e1c 100644 --- a/demo-mq-kafka/README.md +++ b/demo-mq-kafka/README.md @@ -126,13 +126,8 @@ spring: * kafka配置类 *

* - * @package: com.xkcoding.mq.kafka.config - * @description: kafka配置类 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:49 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:49 */ @Configuration @EnableConfigurationProperties({KafkaProperties.class}) @@ -186,13 +181,8 @@ public class KafkaConfig { * 消息处理器 *

* - * @package: com.xkcoding.mq.kafka.handler - * @description: 消息处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:58 */ @Component @Slf4j diff --git a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java index cbbee8411..c2e8e5e8c 100644 --- a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java +++ b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/SpringBootDemoMqKafkaApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.mq.kafka - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:43 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:43 */ @SpringBootApplication public class SpringBootDemoMqKafkaApplication { diff --git a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java index 730cb076f..b7d9c75ca 100644 --- a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java +++ b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/config/KafkaConfig.java @@ -16,13 +16,8 @@ * kafka配置类 *

* - * @package: com.xkcoding.mq.kafka.config - * @description: kafka配置类 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:49 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:49 */ @Configuration @EnableConfigurationProperties({KafkaProperties.class}) diff --git a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java index 48518d752..3546abb94 100644 --- a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java +++ b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/constants/KafkaConsts.java @@ -5,13 +5,8 @@ * kafka 常量池 *

* - * @package: com.xkcoding.mq.kafka.constants - * @description: kafka 常量池 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:52 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:52 */ public interface KafkaConsts { /** diff --git a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java index a55552ebc..61dee1739 100644 --- a/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java +++ b/demo-mq-kafka/src/main/java/com/xkcoding/mq/kafka/handler/MessageHandler.java @@ -12,13 +12,8 @@ * 消息处理器 *

* - * @package: com.xkcoding.mq.kafka.handler - * @description: 消息处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-07 14:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-07 14:58 */ @Component @Slf4j diff --git a/demo-mq-rabbitmq/README.md b/demo-mq-rabbitmq/README.md index a18da05c2..d7fe45e08 100644 --- a/demo-mq-rabbitmq/README.md +++ b/demo-mq-rabbitmq/README.md @@ -42,7 +42,7 @@ Applying plugin configuration to rabbit@f72ac937f2be... The following plugins have been enabled: rabbitmq_delayed_message_exchange - + started 1 plugins. ``` @@ -156,13 +156,8 @@ spring: * RabbitMQ常量池 *

* - * @package: com.xkcoding.mq.rabbitmq.constants - * @description: RabbitMQ常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-29 17:08 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 17:08 */ public interface RabbitConsts { /** @@ -231,13 +226,8 @@ public interface RabbitConsts { * RabbitMQ配置,主要是配置队列,如果提前存在该队列,可以省略本配置类 *

* - * @package: com.xkcoding.mq.rabbitmq.config - * @description: RabbitMQ配置,主要是配置队列,如果提前存在该队列,可以省略本配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-29 17:03 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 17:03 */ @Slf4j @Configuration @@ -399,13 +389,8 @@ public class RabbitMqConfig { * 直接队列1 处理器 *

* - * @package: com.xkcoding.mq.rabbitmq.handler - * @description: 直接队列1 处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-04 15:42 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-04 15:42 */ @Slf4j @RabbitListener(queues = RabbitConsts.DIRECT_MODE_QUEUE_ONE) @@ -544,6 +529,6 @@ public class SpringBootDemoMqRabbitmqApplicationTests { ## 参考 -1. Spring AMQP 官方文档:https://docs.spring.io/spring-amqp/docs/2.1.0.RELEASE/reference/html/ +1. SpringQP 官方文档:https://docs.spring.io/spring-amqp/docs/2.1.0.RELEASE/reference/html/ 2. RabbitMQ 官网:http://www.rabbitmq.com/ -3. RabbitMQ延迟队列:https://www.cnblogs.com/vipstone/p/9967649.html \ No newline at end of file +3. RabbitMQ延迟队列:https://www.cnblogs.com/vipstone/p/9967649.html diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java index e5c53d2db..2d96bb936 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.mq.rabbitmq - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-29 13:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 13:58 */ @SpringBootApplication public class SpringBootDemoMqRabbitmqApplication { diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java index e55f01c6d..77addf03f 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/config/RabbitMqConfig.java @@ -16,13 +16,8 @@ * RabbitMQ配置,主要是配置队列,如果提前存在该队列,可以省略本配置类 *

* - * @package: com.xkcoding.mq.rabbitmq.config - * @description: RabbitMQ配置,主要是配置队列,如果提前存在该队列,可以省略本配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-29 17:03 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 17:03 */ @Slf4j @Configuration diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java index 8c117aab5..75167469a 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/constants/RabbitConsts.java @@ -5,13 +5,8 @@ * RabbitMQ常量池 *

* - * @package: com.xkcoding.mq.rabbitmq.constants - * @description: RabbitMQ常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-29 17:08 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 17:08 */ public interface RabbitConsts { /** diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java index 6a07dd174..15f4b24f8 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DelayQueueHandler.java @@ -17,13 +17,8 @@ * 延迟队列处理器 *

* - * @package: com.xkcoding.mq.rabbitmq.handler - * @description: 延迟队列处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-04 17:42 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-04 17:42 */ @Slf4j @Component diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java index 6ce77c826..5b7559e6f 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/DirectQueueOneHandler.java @@ -17,13 +17,8 @@ * 直接队列1 处理器 *

* - * @package: com.xkcoding.mq.rabbitmq.handler - * @description: 直接队列1 处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-04 15:42 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-04 15:42 */ @Slf4j @RabbitListener(queues = RabbitConsts.DIRECT_MODE_QUEUE_ONE) diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java index 79c284db6..af229c1b3 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueThreeHandler.java @@ -17,13 +17,8 @@ * 队列2 处理器 *

* - * @package: com.xkcoding.mq.rabbitmq.handler - * @description: 队列2 处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-04 15:42 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-04 15:42 */ @Slf4j @RabbitListener(queues = RabbitConsts.QUEUE_THREE) diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java index 1a217434f..1369ab69e 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/handler/QueueTwoHandler.java @@ -17,13 +17,8 @@ * 队列2 处理器 *

* - * @package: com.xkcoding.mq.rabbitmq.handler - * @description: 队列2 处理器 - * @author: yangkai.shen - * @date: Created in 2019-01-04 15:42 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-04 15:42 */ @Slf4j @RabbitListener(queues = RabbitConsts.QUEUE_TWO) diff --git a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java index 7d0553d77..71c1125cd 100644 --- a/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java +++ b/demo-mq-rabbitmq/src/main/java/com/xkcoding/mq/rabbitmq/message/MessageStruct.java @@ -12,13 +12,8 @@ * 测试消息体 *

* - * @package: com.xkcoding.mq.rabbitmq.message - * @description: 测试消息体 - * @author: yangkai.shen - * @date: Created in 2018-12-29 16:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-29 16:22 */ @Data @Builder diff --git a/demo-multi-datasource-jpa/README.md b/demo-multi-datasource-jpa/README.md index 7f432a909..326aa9372 100644 --- a/demo-multi-datasource-jpa/README.md +++ b/demo-multi-datasource-jpa/README.md @@ -91,13 +91,8 @@ * JPA多数据源配置 - 主数据源 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 主数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-17 15:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 15:58 */ @Configuration public class PrimaryDataSourceConfig { @@ -151,13 +146,8 @@ public class PrimaryDataSourceConfig { * JPA多数据源配置 - 次数据源 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 次数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-17 15:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 15:58 */ @Configuration public class SecondDataSourceConfig { @@ -208,13 +198,8 @@ public class SecondDataSourceConfig { * JPA多数据源配置 - 主 JPA 配置 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 主 JPA 配置 - * @author: yangkai.shen - * @date: Created in 2019-01-17 16:54 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 16:54 */ @Configuration @EnableTransactionManagement @@ -301,13 +286,8 @@ public class PrimaryJpaConfig { * JPA多数据源配置 - 次 JPA 配置 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 次 JPA 配置 - * @author: yangkai.shen - * @date: Created in 2019-01-17 16:54 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 16:54 */ @Configuration @EnableTransactionManagement @@ -553,4 +533,4 @@ public class SpringBootDemoMultiDatasourceJpaApplicationTests { ## 参考 1. https://www.jianshu.com/p/34730e595a8c -2. https://blog.csdn.net/anxpp/article/details/52274120 \ No newline at end of file +2. https://blog.csdn.net/anxpp/article/details/52274120 diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java index b8e1f1f1c..e5451c261 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.multi.datasource.jpa - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-01-16 17:34 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-16 17:34 */ @SpringBootApplication public class SpringBootDemoMultiDatasourceJpaApplication { diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java index 3d3825e3a..fcfcb25e4 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryDataSourceConfig.java @@ -15,13 +15,8 @@ * JPA多数据源配置 - 主数据源 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 主数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-17 15:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 15:58 */ @Configuration public class PrimaryDataSourceConfig { diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java index ba9fd5de2..6ed198ac0 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java @@ -1,6 +1,5 @@ package com.xkcoding.multi.datasource.jpa.config; -import com.zaxxer.hikari.HikariDataSource; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -23,13 +22,8 @@ * JPA多数据源配置 - 主 JPA 配置 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 主 JPA 配置 - * @author: yangkai.shen - * @date: Created in 2019-01-17 16:54 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 16:54 */ @Configuration @EnableTransactionManagement diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java index 4a79ddd04..49b7746ce 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondDataSourceConfig.java @@ -14,13 +14,8 @@ * JPA多数据源配置 - 次数据源 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 次数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-17 15:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 15:58 */ @Configuration public class SecondDataSourceConfig { diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java index 1a4f1fe4c..3228f6beb 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java @@ -21,13 +21,8 @@ * JPA多数据源配置 - 次 JPA 配置 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: JPA多数据源配置 - 次 JPA 配置 - * @author: yangkai.shen - * @date: Created in 2019-01-17 16:54 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-17 16:54 */ @Configuration @EnableTransactionManagement diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java index c143ed037..0b900e317 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java @@ -10,13 +10,8 @@ * 雪花算法生成器 *

* - * @package: com.xkcoding.multi.datasource.jpa.config - * @description: 雪花算法生成器 - * @author: yangkai.shen - * @date: Created in 2019-01-18 15:50 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-18 15:50 */ @Configuration public class SnowflakeConfig { diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java index 414db789b..4904e690f 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/primary/PrimaryMultiTable.java @@ -4,10 +4,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.annotations.GenericGenerator; import javax.persistence.Entity; -import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Table; @@ -16,13 +14,8 @@ * 多数据源测试表 *

* - * @package: com.xkcoding.multi.datasource.jpa.entity.primary - * @description: 多数据源测试表 - * @author: yangkai.shen - * @date: Created in 2019-01-18 10:06 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-18 10:06 */ @Data @Entity diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java index b9e152bcb..3756681f5 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/entity/second/SecondMultiTable.java @@ -4,22 +4,18 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.annotations.GenericGenerator; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; /** *

* 多数据源测试表 *

* - * @package: com.xkcoding.multi.datasource.jpa.entity.second - * @description: 多数据源测试表 - * @author: yangkai.shen - * @date: Created in 2019-01-18 10:06 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-18 10:06 */ @Data @Entity diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java index 9c8fe0505..91cd78b8b 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java @@ -9,13 +9,8 @@ * 多数据源测试 repo *

* - * @package: com.xkcoding.multi.datasource.jpa.repository.primary - * @description: 多数据源测试 repo - * @author: yangkai.shen - * @date: Created in 2019-01-18 10:11 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-18 10:11 */ @Repository public interface PrimaryMultiTableRepository extends JpaRepository { diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java index 5752f5530..0fc6ba853 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java @@ -9,13 +9,8 @@ * 多数据源测试 repo *

* - * @package: com.xkcoding.multi.datasource.jpa.repository.second - * @description: 多数据源测试 repo - * @author: yangkai.shen - * @date: Created in 2019-01-18 10:11 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-18 10:11 */ @Repository public interface SecondMultiTableRepository extends JpaRepository { diff --git a/demo-multi-datasource-mybatis/README.md b/demo-multi-datasource-mybatis/README.md index fdd738923..0bacd48ad 100644 --- a/demo-multi-datasource-mybatis/README.md +++ b/demo-multi-datasource-mybatis/README.md @@ -119,13 +119,8 @@ CREATE TABLE `multi_user`( * User实体类 *

* - * @package: com.xkcoding.multi.datasource.mybatis.model - * @description: User实体类 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:19 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:19 */ @Data @TableName("multi_user") @@ -165,13 +160,8 @@ public class User implements Serializable { * 数据访问层 *

* - * @package: com.xkcoding.multi.datasource.mybatis.mapper - * @description: 数据访问层 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:28 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:28 */ public interface UserMapper extends BaseMapper { } @@ -189,13 +179,8 @@ public interface UserMapper extends BaseMapper { * 数据服务层 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service - * @description: 数据服务层 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:31 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:31 */ public interface UserService extends IService { @@ -222,13 +207,8 @@ public interface UserService extends IService { * 数据服务层 实现 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service.impl - * @description: 数据服务层 实现 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:37 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:37 */ @Service @DS("slave") @@ -259,13 +239,8 @@ public class UserServiceImpl extends ServiceImpl implements Us * 启动器 *

* - * @package: com.xkcoding.multi.datasource.mybatis - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:19 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:19 */ @SpringBootApplication @MapperScan(basePackages = "com.xkcoding.multi.datasource.mybatis.mapper") @@ -311,13 +286,8 @@ logging: * 测试主从数据源 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service.impl - * @description: 测试主从数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:45 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:45 */ @Slf4j public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApplicationTests { @@ -360,10 +330,10 @@ public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApp 2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 动态数据源-加载 slave 成功 2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 动态数据源-加载 master 成功 2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 当前的默认数据源是单数据源,数据源名为 master - _ _ |_ _ _|_. ___ _ | _ -| | |\/|_)(_| | |_\ |_)||_|_\ - / | - 3.0.7.1 + _ _ |_ _ _|_. ___ _ | _ +| | |\/|_)(_| | |_\ |_)||_|_\ + / | + 3.0.7.1 ``` **主**库 **建议** 只执行 **INSERT** **UPDATE** **DELETE** 操作 @@ -379,4 +349,4 @@ public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApp ## 参考 1. Mybatis-Plus 多数据源文档:https://mybatis.plus/guide/dynamic-datasource.html -2. Mybatis-Plus 多数据源集成官方 demo:https://gitee.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/samples \ No newline at end of file +2. Mybatis-Plus 多数据源集成官方 demo:https://gitee.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/samples diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java index 5fbc29c36..bdeb42be2 100644 --- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java +++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.multi.datasource.mybatis - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:19 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:19 */ @SpringBootApplication @MapperScan(basePackages = "com.xkcoding.multi.datasource.mybatis.mapper") diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java index 51a6dd5ed..3e8999ce6 100644 --- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java +++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java @@ -8,13 +8,8 @@ * 数据访问层 *

* - * @package: com.xkcoding.multi.datasource.mybatis.mapper - * @description: 数据访问层 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:28 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:28 */ public interface UserMapper extends BaseMapper { } diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java index f895d3c08..6790049f2 100644 --- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java +++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java @@ -15,13 +15,8 @@ * User实体类 *

* - * @package: com.xkcoding.multi.datasource.mybatis.model - * @description: User实体类 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:19 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:19 */ @Data @TableName("multi_user") @@ -46,4 +41,4 @@ public class User implements Serializable { * 年龄 */ private Integer age; -} \ No newline at end of file +} diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java index f9d84fdba..8e805632a 100644 --- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java +++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java @@ -8,13 +8,8 @@ * 数据服务层 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service - * @description: 数据服务层 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:31 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:31 */ public interface UserService extends IService { diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java index 2d4bec005..65a4f5afd 100644 --- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java +++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java @@ -12,13 +12,8 @@ * 数据服务层 实现 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service.impl - * @description: 数据服务层 实现 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:37 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:37 */ @Service @DS("slave") diff --git a/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java index a57b73274..fe11b6dc4 100644 --- a/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java +++ b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java @@ -16,13 +16,8 @@ * 测试主从数据源 *

* - * @package: com.xkcoding.multi.datasource.mybatis.service.impl - * @description: 测试主从数据源 - * @author: yangkai.shen - * @date: Created in 2019-01-21 14:45 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-21 14:45 */ @Slf4j public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApplicationTests { @@ -49,4 +44,4 @@ public void testListUser() { List list = userService.list(new QueryWrapper<>()); log.info("【list】= {}", JSONUtil.toJsonStr(list)); } -} \ No newline at end of file +} diff --git a/demo-neo4j/README.md b/demo-neo4j/README.md index 08466e596..0321a9942 100644 --- a/demo-neo4j/README.md +++ b/demo-neo4j/README.md @@ -106,13 +106,8 @@ spring: * 自定义主键策略 *

* - * @package: com.xkcoding.neo4j.config - * @description: 自定义主键策略 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:40 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:40 */ public class CustomIdStrategy implements IdStrategy { @Override @@ -132,13 +127,8 @@ public class CustomIdStrategy implements IdStrategy { * 学生节点 *

* - * @package: com.xkcoding.neo4j.model - * @description: 学生节点 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:38 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:38 */ @Data @NoArgsConstructor @@ -187,13 +177,8 @@ public class Student { * 学生节点Repository *

* - * @package: com.xkcoding.neo4j.repository - * @description: 学生节点Repository - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:05 */ public interface StudentRepository extends Neo4jRepository { /** @@ -249,13 +234,8 @@ public interface StudentRepository extends Neo4jRepository { * 测试Neo4j *

* - * @package: com.xkcoding.neo4j - * @description: 测试Neo4j - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:17 */ @Slf4j public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests { @@ -336,4 +316,4 @@ public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests { ## 参考 - spring-data-neo4j 官方文档:https://docs.spring.io/spring-data/neo4j/docs/5.1.2.RELEASE/reference/html/ -- neo4j 官方文档:https://neo4j.com/docs/getting-started/3.5/ \ No newline at end of file +- neo4j 官方文档:https://neo4j.com/docs/getting-started/3.5/ diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java index b15c70d46..45bc87001 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.neo4j - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-22 23:50 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-22 23:50 */ @SpringBootApplication public class SpringBootDemoNeo4jApplication { diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java index 5cc877819..511236b9f 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java @@ -8,13 +8,8 @@ * 自定义主键策略 *

* - * @package: com.xkcoding.neo4j.config - * @description: 自定义主键策略 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:40 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:40 */ public class CustomIdStrategy implements IdStrategy { @Override diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java index 0ea6f9d68..b420272d1 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java @@ -5,13 +5,8 @@ * 常量池 *

* - * @package: com.xkcoding.neo4j.constants - * @description: 常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:45 */ public interface NeoConsts { /** diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java index 8af1f6630..faf58351f 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java @@ -13,13 +13,8 @@ * 班级节点 *

* - * @package: com.xkcoding.neo4j.model - * @description: 班级节点 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:44 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:44 */ @Data @NoArgsConstructor diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java index 8d96d4293..6fa9f4368 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java @@ -13,13 +13,8 @@ * 课程节点 *

* - * @package: com.xkcoding.neo4j.model - * @description: 课程节点 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:55 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:55 */ @Data @NoArgsConstructor diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java index 4ce6a852a..56dd4f74f 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java @@ -15,13 +15,8 @@ * 学生节点 *

* - * @package: com.xkcoding.neo4j.model - * @description: 学生节点 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:38 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:38 */ @Data @NoArgsConstructor diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java index 968ddb1f8..62106ed67 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java @@ -11,13 +11,8 @@ * 教师节点 *

* - * @package: com.xkcoding.neo4j.model - * @description: 教师节点 - * @author: yangkai.shen - * @date: Created in 2018-12-24 14:54 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 14:54 */ @Data @NoArgsConstructor diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java index b5a156c95..453d11d6a 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java @@ -11,13 +11,8 @@ * 按照课程分组的同学关系 *

* - * @package: com.xkcoding.neo4j.payload - * @description: 按照课程分组的同学关系 - * @author: yangkai.shen - * @date: Created in 2018-12-24 19:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 19:18 */ @Data @QueryResult diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java index 57eca8426..d70fcf29b 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java @@ -11,13 +11,8 @@ * 师生关系 *

* - * @package: com.xkcoding.neo4j.payload - * @description: 师生关系 - * @author: yangkai.shen - * @date: Created in 2018-12-24 19:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 19:18 */ @Data @QueryResult diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java index e8c59b946..ef859792b 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java @@ -10,13 +10,8 @@ * 班级节点Repository *

* - * @package: com.xkcoding.neo4j.repository - * @description: 班级节点Repository - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:05 */ public interface ClassRepository extends Neo4jRepository { /** diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java index a4f7b9db4..fcf010c2f 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java @@ -8,13 +8,8 @@ * 课程节点Repository *

* - * @package: com.xkcoding.neo4j.repository - * @description: 课程节点Repository - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:05 */ public interface LessonRepository extends Neo4jRepository { } diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java index 00956d7ec..a5037c996 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java @@ -16,13 +16,8 @@ * 学生节点Repository *

* - * @package: com.xkcoding.neo4j.repository - * @description: 学生节点Repository - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:05 */ public interface StudentRepository extends Neo4jRepository { /** diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java index 380f1ff11..f7d2d6437 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java @@ -8,13 +8,8 @@ * 教师节点Repository *

* - * @package: com.xkcoding.neo4j.repository - * @description: 教师节点Repository - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:05 */ public interface TeacherRepository extends Neo4jRepository { } diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java index b0a04f345..664fad10c 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java @@ -30,13 +30,8 @@ * NeoService *

* - * @package: com.xkcoding.neo4j.service - * @description: NeoService - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:19 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:19 */ @Service public class NeoService { diff --git a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java index 9f4fed2c1..f529833fd 100644 --- a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java +++ b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java @@ -18,13 +18,8 @@ * 测试Neo4j *

* - * @package: com.xkcoding.neo4j - * @description: 测试Neo4j - * @author: yangkai.shen - * @date: Created in 2018-12-24 15:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-24 15:17 */ @Slf4j public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests { diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java index ed73b619c..af2dd9963 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java @@ -8,15 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.oauth - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-02-17 23:52 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen - * @modified: EchoCow - * @date: Modified in 2020-01-6 21:12 + * @author yangkai.shen + * @date Created in 2019-02-17 23:52 */ @SpringBootApplication public class SpringBootDemoOauthApplication { diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java index 816ab0718..d9e024809 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java @@ -15,7 +15,7 @@ * 登录失败处理器,失败后携带失败信息重定向到登录地址重新登录. * * @author EchoCow - * @date 2020/1/7 下午1:01 + * @date 2020-01-07 13:01 */ @Slf4j @Component diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java index 1737a6304..61f9f35c4 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java @@ -14,7 +14,7 @@ * 客户团退出登录成功处理器. * * @author EchoCow - * @date 2020/1/6 下午22:11 + * @date 2020-01-06 22:11 */ @Slf4j @Component diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java index 787c9f36d..9326fb5e7 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java @@ -17,7 +17,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午1:32 + * @date 2020-01-06 13:32 */ @Configuration @RequiredArgsConstructor diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java index 39ac77951..c002434c7 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java @@ -18,7 +18,7 @@ * token 相关配置. * * @author EchoCow - * @date 2020/1/6 下午1:33 + * @date 2020-01-06 13:33 */ @Configuration @RequiredArgsConstructor diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java index d6071cb53..b458ffc5c 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java @@ -12,7 +12,7 @@ * 安全配置. * * @author EchoCow - * @date 2020/1/6 下午1:27 + * @date 2020-01-06 13:27 */ @EnableWebSecurity @RequiredArgsConstructor diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java index 11cfadbd2..133f549e6 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java @@ -17,6 +17,6 @@ * * * @author EchoCow - * @date 2020/1/7 上午9:16 + * @date 2020-01-07 9:16 */ package com.xkcoding.oauth.config; diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java index 81754677e..a7e26e238 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java @@ -15,7 +15,7 @@ * 我们只是在中途修改了它确认的一些信息而已。 * * @author EchoCow - * @date 2020/1/6 下午4:42 + * @date 2020-01-06 16:42 */ @Controller @SessionAttributes("authorizationRequest") diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java index 5d7aa5d7b..061c1c0e1 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java @@ -15,7 +15,7 @@ * 页面控制器. * * @author EchoCow - * @date 2020/1/6 下午4:30 + * @date 2020-01-06 16:30 */ @Controller @RequestMapping("/oauth") diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java index 453b76cd4..1b58c7187 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java @@ -8,7 +8,7 @@ * 或者退出的时候携带什么标识,都可以。 * * @author EchoCow - * @date 2020/1/7 上午11:25 + * @date 2020-01-07 11:25 * @see org.springframework.security.oauth2.provider.endpoint.AuthorizationEndpoint */ package com.xkcoding.oauth.controller; diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java index 535e36614..7562d2838 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java @@ -18,7 +18,7 @@ * 另一种方式是写一个方法将它转化为默认实现 {@link BaseClientDetails} 比较好一点并且简单很多 * * @author EchoCow - * @date 2020/1/6 下午12:54 + * @date 2020-01-06 12:54 */ @Data @Table diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java index e6e4f699a..a5362e655 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java @@ -3,7 +3,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.codehaus.jackson.annotate.JsonIgnore; import javax.persistence.*; import java.util.Set; @@ -14,7 +13,7 @@ * 角色信息. * * @author EchoCow - * @date 2020/1/6 下午12:44 + * @date 2020-01-06 12:44 */ @Data @Table diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java index 84a96411b..788825912 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java @@ -17,7 +17,7 @@ * 实现接口的方式可以参考 {@link SysClientDetails} * * @author EchoCow - * @date 2020/1/6 下午12:41 + * @date 2020-01-06 12:41 */ @Data @Table diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java index 1184acaf3..83dcfd11d 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java @@ -10,7 +10,7 @@ * 客户端信息. * * @author EchoCow - * @date 2020/1/6 下午1:09 + * @date 2020-01-06 13:09 */ public interface SysClientDetailsRepository extends JpaRepository { diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java index a5aaff9cf..0145759fd 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java @@ -9,7 +9,7 @@ * 用户信息仓库. * * @author EchoCow - * @date 2020/1/6 下午1:08 + * @date 2020-01-06 13:08 */ public interface SysUserRepository extends JpaRepository { diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java index 408414a45..5ccbdbd9a 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java @@ -13,7 +13,7 @@ * 参见 {@link ClientRegistrationService} * * @author EchoCow - * @date 2020/1/6 下午1:39 + * @date 2020-01-06 13:39 */ public interface SysClientDetailsService extends ClientDetailsService { diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java index 6604a54a4..95b8fa919 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java @@ -10,7 +10,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午3:44 + * @date 2020-01-06 15:44 */ public interface SysUserService extends UserDetailsService { /** diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java index 00e36629e..3721373d5 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java @@ -14,7 +14,7 @@ * 客户端 相关操作. * * @author EchoCow - * @date 2020/1/6 下午1:37 + * @date 2020-01-06 13:37 */ @Service @RequiredArgsConstructor diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java index 307af4d6d..0f1b814c2 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java @@ -18,7 +18,7 @@ * 用户相关操作. * * @author EchoCow - * @date 2020/1/6 下午3:06 + * @date 2020-01-06 15:06 */ @Service @RequiredArgsConstructor diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java index 45f57f553..b10f52f4d 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java @@ -2,6 +2,6 @@ * service 层,继承并实现 spring 接口. * * @author EchoCow - * @date 2020/1/7 上午9:16 + * @date 2020-01-07 9:16 */ package com.xkcoding.oauth.service; diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java index 3dc8233a4..84cd8bb7d 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java @@ -8,7 +8,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午3:51 + * @date 2020-01-06 15:51 */ public class PasswordEncodeTest { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java index 01e0d447b..ff06e8a98 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java @@ -26,7 +26,7 @@ * 授权码模式测试. * * @author EchoCow - * @date 2020/1/6 下午8:43 + * @date 2020-01-06 20:43 */ public class AuthorizationCodeGrantTests { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java index 0c229199c..de5a186bc 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java @@ -16,7 +16,7 @@ * 授权服务器工具类. * * @author EchoCow - * @date 2020/1/6 下午8:44 + * @date 2020-01-06 20:44 */ @SuppressWarnings("all") public class AuthorizationServerInfo { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java index 38d8d1ddc..abe19e1c0 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java @@ -14,7 +14,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午9:14 + * @date 2020-01-06 21:14 */ public class ResourceOwnerPasswordGrantTests { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java index c0126bc09..515ebe083 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java @@ -11,7 +11,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午1:10 + * @date 2020-01-06 13:10 */ @DataJpaTest public class SysClientDetailsTest { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java index 7df067973..50903d1ec 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java @@ -15,7 +15,7 @@ * . * * @author EchoCow - * @date 2020/1/6 下午1:25 + * @date 2020-01-06 13:25 */ @DataJpaTest public class SysUserRepositoryTest { diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java index 33b7bd90c..fb4ac930f 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java @@ -8,7 +8,7 @@ * 启动器. * * @author EchoCow - * @date 2020/1/9 上午11:38 + * @date 2020-01-09 11:38 * @version V1.0 */ @EnableResourceServer diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java index 2d3243e17..f221ce472 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java @@ -15,7 +15,7 @@ * 我们自己实现了它的配置,所以它的自动装配不会生效 * * @author EchoCow - * @date 2020/1/9 下午2:20 + * @date 2020-01-09 14:20 */ @Configuration @AllArgsConstructor diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java index c28c72cc3..dd5927fb2 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java @@ -22,7 +22,7 @@ * token 相关配置,jwt 相关. * * @author EchoCow - * @date 2020/1/9 下午2:39 + * @date 2020-01-09 14:39 */ @Slf4j @Configuration diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java index 9c6ed628c..b3f1572e0 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java @@ -8,7 +8,7 @@ * 测试接口. * * @author EchoCow - * @date 2020/1/9 下午2:37 + * @date 2020-01-09 14:37 */ @RestController public class TestController { diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java index 774a4ec02..207feb641 100644 --- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java +++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java @@ -13,7 +13,7 @@ * . * * @author EchoCow - * @date 2020/1/9 下午3:44 + * @date 2020-01-09 15:44 */ public class AuthorizationTest { public static final String AUTHORIZATION_SERVER = "http://127.0.0.1:8080"; diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java index ea0a43268..2e933b7ed 100644 --- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java +++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java @@ -19,7 +19,7 @@ * . * * @author EchoCow - * @date 2020/1/9 下午3:46 + * @date 2020-01-09 15:46 */ public class TestControllerTest extends AuthorizationTest { diff --git a/demo-orm-beetlsql/README.md b/demo-orm-beetlsql/README.md index 08cdf575c..1eb3827b0 100644 --- a/demo-orm-beetlsql/README.md +++ b/demo-orm-beetlsql/README.md @@ -88,7 +88,7 @@ ``` -## application.yml +## application.yml > 注意下方注释的地方,**不能解开注释,并且需要通过JavaConfig的方式手动配置数据源**,否则,会导致beetl启动失败,因此,初始化数据库的数据,只能手动在数据库使用 resources/db 下的建表语句和数据库初始化数据。 @@ -141,13 +141,8 @@ beet-beetlsql: * Beetl数据源配置 *

* - * @package: com.xkcoding.orm.beetlsql.config - * @description: Beetl数据源配置 - * @author: yangkai.shen - * @date: Created in 2018/11/14 17:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 17:15 */ @Configuration public class BeetlConfig { @@ -175,13 +170,8 @@ public class BeetlConfig { * UserDao *

* - * @package: com.xkcoding.orm.beetlsql.dao - * @description: UserDao - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:18 */ @Component public interface UserDao extends BaseMapper { @@ -197,13 +187,8 @@ public interface UserDao extends BaseMapper { * User Service *

* - * @package: com.xkcoding.orm.beetlsql.service.impl - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:28 */ @Service @Slf4j @@ -305,13 +290,8 @@ public class UserServiceImpl implements UserService { * User Service测试 *

* - * @package: com.xkcoding.orm.beetlsql.service - * @description: User Service测试 - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:30 */ @Slf4j public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests { @@ -385,4 +365,4 @@ public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests { - BeetlSQL官方文档:http://ibeetl.com/guide/#beetlsql - 开源项目:https://gitee.com/yangkb/springboot-beetl-beetlsql -- 博客:https://blog.csdn.net/flystarfly/article/details/82752597 \ No newline at end of file +- 博客:https://blog.csdn.net/flystarfly/article/details/82752597 diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java index 825efe69a..62662fc6d 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.orm.beetlsql - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/11/14 15:47 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 15:47 */ @SpringBootApplication public class SpringBootDemoOrmBeetlsqlApplication { diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java index 27271600c..6ec1b5a2f 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java @@ -12,13 +12,8 @@ * Beetl数据源配置 *

* - * @package: com.xkcoding.orm.beetlsql.config - * @description: Beetl数据源配置 - * @author: yangkai.shen - * @date: Created in 2018/11/14 17:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 17:15 */ @Configuration public class BeetlConfig { diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java index 63238d586..8dda59790 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java @@ -9,13 +9,8 @@ * UserDao *

* - * @package: com.xkcoding.orm.beetlsql.dao - * @description: UserDao - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:18 */ @Component public interface UserDao extends BaseMapper { diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java index 71e2fd3d2..9a4aadbfa 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java @@ -14,13 +14,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.beetlsql.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:06 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:06 */ @Data @NoArgsConstructor diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java index a0e7af1ca..15392888a 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java @@ -10,13 +10,8 @@ * User Service *

* - * @package: com.xkcoding.orm.beetlsql.service - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:18 */ public interface UserService { /** diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java index f4bad1002..7ab1f7e7d 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java @@ -16,13 +16,8 @@ * User Service *

* - * @package: com.xkcoding.orm.beetlsql.service.impl - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:28 */ @Service @Slf4j diff --git a/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java index 0f3aaa2a9..50e636323 100644 --- a/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java +++ b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java @@ -8,7 +8,6 @@ import cn.hutool.json.JSONUtil; import com.xkcoding.orm.beetlsql.SpringBootDemoOrmBeetlsqlApplicationTests; import com.xkcoding.orm.beetlsql.entity.User; -import com.xkcoding.orm.beetlsql.service.UserService; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.Lists; import org.beetl.sql.core.engine.PageQuery; @@ -23,13 +22,8 @@ * User Service测试 *

* - * @package: com.xkcoding.orm.beetlsql.service - * @description: User Service测试 - * @author: yangkai.shen - * @date: Created in 2018/11/14 16:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-14 16:30 */ @Slf4j public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests { @@ -96,4 +90,4 @@ public void getUserByPage() { Assert.assertEquals(userList.size(), userByPage.getTotalRow()); log.debug("【userByPage】= {}", JSONUtil.toJsonStr(userByPage)); } -} \ No newline at end of file +} diff --git a/demo-orm-jdbctemplate/README.md b/demo-orm-jdbctemplate/README.md index 3d54e678e..b170dd700 100644 --- a/demo-orm-jdbctemplate/README.md +++ b/demo-orm-jdbctemplate/README.md @@ -83,13 +83,8 @@ * Dao基类 *

* - * @package: com.xkcoding.orm.jdbctemplate.dao.base - * @description: Dao基类 - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:28 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:28 */ @Slf4j public class BaseDao { @@ -329,4 +324,4 @@ logging: ## 备注 -其余详细代码参见 demo \ No newline at end of file +其余详细代码参见 demo diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java index ab0d2c5c6..292f7b700 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java @@ -1,7 +1,5 @@ package com.xkcoding.orm.jdbctemplate; -import cn.hutool.core.util.IdUtil; -import cn.hutool.crypto.SecureUtil; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.orm.jdbctemplate - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/15 9:50 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 9:50 */ @SpringBootApplication public class SpringBootDemoOrmJdbctemplateApplication { diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java index 4dd5245fd..bd65b9a4b 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java @@ -10,13 +10,8 @@ * 列注解 *

* - * @package: com.xkcoding.orm.jdbctemplate.annotation - * @description: 列注解 - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:23 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:23 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java index 7a84f3dfe..fba3dc5af 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java @@ -10,13 +10,8 @@ * 需要忽略的字段 *

* - * @package: com.xkcoding.orm.jdbctemplate.annotation - * @description: 需要忽略的字段 - * @author: yangkai.shen - * @date: Created in 2018/10/15 1:25 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 13:25 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java index aea8366e4..599faa4b1 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java @@ -10,13 +10,8 @@ * 主键注解 *

* - * @package: com.xkcoding.orm.jdbctemplate.annotation - * @description: 主键注解 - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:23 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:23 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java index b5095482c..d914e2368 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java @@ -10,13 +10,8 @@ * 表注解 *

* - * @package: com.xkcoding.orm.jdbctemplate.annotation - * @description: 表注解 - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:23 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:23 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java index 2156ea5c8..9b923b915 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java @@ -5,13 +5,8 @@ * 常量池 *

* - * @package: com.xkcoding.orm.jdbctemplate.constant - * @description: 常量池 - * @author: yangkai.shen - * @date: Created in 2018/10/15 10:59 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 10:59 */ public interface Const { /** diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java index 4616ff314..7c8ed7bb0 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java @@ -14,13 +14,8 @@ * User Controller *

* - * @package: com.xkcoding.orm.jdbctemplate.controller - * @description: User Controller - * @author: yangkai.shen - * @date: Created in 2018/10/15 1:58 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 13:58 */ @RestController @Slf4j diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java index 0ccf99002..f4e5e469e 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java @@ -13,13 +13,8 @@ * User Dao *

* - * @package: com.xkcoding.orm.jdbctemplate.dao - * @description: User Dao - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:15 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:15 */ @Repository public class UserDao extends BaseDao { diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java index 42c735d5b..b0952f5fb 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java @@ -30,13 +30,8 @@ * Dao基类 *

* - * @package: com.xkcoding.orm.jdbctemplate.dao.base - * @description: Dao基类 - * @author: yangkai.shen - * @date: Created in 2018/10/15 11:28 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 11:28 */ @Slf4j public class BaseDao { diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java index e21697ba2..7b6ebc073 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java @@ -13,13 +13,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.jdbctemplate.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/10/15 10:45 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 10:45 */ @Data @Table(name = "orm_user") diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java index c4b686eeb..099865c14 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java @@ -9,13 +9,8 @@ * User Service *

* - * @package: com.xkcoding.orm.jdbctemplate.service - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/10/15 1:51 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 13:51 */ public interface IUserService { /** diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java index 6f0dccfbb..33afbc2d5 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java @@ -20,13 +20,8 @@ * User Service Implement *

* - * @package: com.xkcoding.orm.jdbctemplate.service.impl - * @description: User Service Implement - * @author: yangkai.shen - * @date: Created in 2018/10/15 1:53 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-15 13:53 */ @Service public class UserServiceImpl implements IUserService { diff --git a/demo-orm-jpa/README.md b/demo-orm-jpa/README.md index fd3013671..416a1b837 100644 --- a/demo-orm-jpa/README.md +++ b/demo-orm-jpa/README.md @@ -88,13 +88,8 @@ * JPA配置类 *

* - * @package: com.xkcoding.orm.jpa.config - * @description: JPA配置类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 11:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 11:05 */ @Configuration @EnableTransactionManagement @@ -133,13 +128,8 @@ public class JpaConfig { * 用户实体类 *

* - * @package: com.xkcoding.orm.jpa.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:06 - * @copyright: Copyright (c) - * @version: V1.0 - * @modified: 76peter + * @author yangkai.shen + * @date Created in 2018-11-07 14:06 */ @EqualsAndHashCode(callSuper = true) @NoArgsConstructor @@ -211,13 +201,8 @@ public class User extends AbstractAuditModel { * 部门实体类 *

* - * @package: com.xkcoding.orm.jpa.entity - * @description: 部门实体类 - * @author: 76peter - * @date: Created in 2019/10/1 18:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2019-10-01 18:07 */ @EqualsAndHashCode(callSuper = true) @Data @@ -272,13 +257,8 @@ public class Department extends AbstractAuditModel { * 实体通用父类 *

* - * @package: com.xkcoding.orm.jpa.entity.base - * @description: 实体通用父类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:01 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:01 */ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) @@ -315,13 +295,8 @@ public abstract class AbstractAuditModel implements Serializable { * User Dao *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: User Dao - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:07 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:07 */ @Repository public interface UserDao extends JpaRepository { @@ -335,13 +310,8 @@ public interface UserDao extends JpaRepository { * User Dao *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: Department Dao - * @author: 76peter - * @date: Created in 2019/10/1 18:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2019-10-01 18:07 */ @Repository public interface DepartmentDao extends JpaRepository { @@ -403,13 +373,8 @@ logging: * jpa 测试类 *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: jpa 测试类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:09 */ @Slf4j public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests { @@ -516,13 +481,8 @@ public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests { * jpa 测试类 *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: jpa 测试类 - * @author: 76peter - * @date: Created in 2018/11/7 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2018-11-07 14:09 */ @Slf4j public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests { @@ -587,4 +547,4 @@ public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests { ## 参考 -- Spring Data JPA 官方文档:https://docs.spring.io/spring-data/jpa/docs/current/reference/html/ +- Spring Data JPA 官方文档:https://docs.spring.io/spring-data/jpa/docs/current/reference/html/ diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java index b048ea04f..1a7c8c5f4 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.orm.jpa - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/28 22:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-28 22:58 */ @SpringBootApplication public class SpringBootDemoOrmJpaApplication { diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java index c60694337..495301d43 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java @@ -20,13 +20,8 @@ * JPA配置类 *

* - * @package: com.xkcoding.orm.jpa.config - * @description: JPA配置类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 11:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 11:05 */ @Configuration @EnableTransactionManagement diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java index 3b71beca7..0de0bb6fb 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java @@ -11,13 +11,8 @@ * 部门实体类 *

* - * @package: com.xkcoding.orm.jpa.entity - * @description: 部门实体类 - * @author: 76peter - * @date: Created in 2019/10/1 18:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2019-10-01 18:07 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java index 27fb30a44..0ea940791 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java @@ -12,13 +12,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.jpa.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:06 - * @copyright: Copyright (c) - * @version: V1.0 - * @modified: 76peter + * @author yangkai.shen + * @date Created in 2018-11-07 14:06 */ @EqualsAndHashCode(callSuper = true) @NoArgsConstructor diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java index beb8547be..dd2f2e439 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java @@ -14,13 +14,8 @@ * 实体通用父类 *

* - * @package: com.xkcoding.orm.jpa.entity.base - * @description: 实体通用父类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:01 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:01 */ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java index dc3fab490..4767bdeb8 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java @@ -12,13 +12,8 @@ * User Dao *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: Department Dao - * @author: 76peter - * @date: Created in 2019/10/1 18:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2019-10-01 18:07 */ @Repository public interface DepartmentDao extends JpaRepository { diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java index 383719a75..c7287939b 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java @@ -9,15 +9,10 @@ * User Dao *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: User Dao - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:07 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:07 */ @Repository public interface UserDao extends JpaRepository { - + } diff --git a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java index 054a5bffd..876d07de4 100644 --- a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java +++ b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java @@ -18,13 +18,8 @@ * jpa 测试类 *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: jpa 测试类 - * @author: 76peter - * @date: Created in 2018/11/7 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: 76peter + * @author 76peter + * @date Created in 2018-11-07 14:09 */ @Slf4j public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests { diff --git a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java index edde1967e..20dde4636 100644 --- a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java +++ b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java @@ -23,13 +23,8 @@ * jpa 测试类 *

* - * @package: com.xkcoding.orm.jpa.repository - * @description: jpa 测试类 - * @author: yangkai.shen - * @date: Created in 2018/11/7 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-07 14:09 */ @Slf4j public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests { @@ -127,4 +122,4 @@ private void initData() { userDao.saveAll(userList); } -} \ No newline at end of file +} diff --git a/demo-orm-mybatis-mapper-page/README.md b/demo-orm-mybatis-mapper-page/README.md index ee3dcb76b..94d7725de 100644 --- a/demo-orm-mybatis-mapper-page/README.md +++ b/demo-orm-mybatis-mapper-page/README.md @@ -100,13 +100,8 @@ * 启动器 *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/8 13:43 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 13:43 */ @SpringBootApplication @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.MapperAndPage.mapper"}) // 注意:这里的 MapperScan 是 tk.mybatis.spring.annotation.MapperScan 这个包下的 @@ -177,13 +172,8 @@ pagehelper: * UserMapper *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper - * @description: UserMapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 14:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 14:15 */ @Component // 注意:这里的Mapper是tk.mybatis.mapper.common.Mapper包下的 @@ -199,13 +189,8 @@ public interface UserMapper extends Mapper, MySqlMapper { * UserMapper 测试 *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper - * @description: UserMapper 测试 - * @author: yangkai.shen - * @date: Created in 2018/11/8 14:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 14:25 */ @Slf4j public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicationTests { @@ -343,4 +328,4 @@ public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicatio ## 参考 - 通用Mapper官方文档:https://github.com/abel533/Mapper/wiki/1.integration -- pagehelper 官方文档:https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/HowToUse.md \ No newline at end of file +- pagehelper 官方文档:https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/HowToUse.md diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java index 41e188724..69a7adeca 100644 --- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java +++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/8 13:43 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 13:43 */ @SpringBootApplication @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.MapperAndPage.mapper"}) diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java index 07ecca17b..3106bfb72 100644 --- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java +++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java @@ -16,13 +16,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 14:14 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 14:14 */ @Data @NoArgsConstructor diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java index 4cc51aeb4..bd8d1215b 100644 --- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java +++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java @@ -10,13 +10,8 @@ * UserMapper *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper - * @description: UserMapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 14:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 14:15 */ @Component public interface UserMapper extends Mapper, MySqlMapper { diff --git a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java index 409616afd..6b9204096 100644 --- a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java +++ b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java @@ -23,13 +23,8 @@ * UserMapper 测试 *

* - * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper - * @description: UserMapper 测试 - * @author: yangkai.shen - * @date: Created in 2018/11/8 14:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 14:25 */ @Slf4j public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicationTests { @@ -161,4 +156,4 @@ private void initData() { testInsertList(); } -} \ No newline at end of file +} diff --git a/demo-orm-mybatis-plus/README.md b/demo-orm-mybatis-plus/README.md index 658fd2052..280605499 100644 --- a/demo-orm-mybatis-plus/README.md +++ b/demo-orm-mybatis-plus/README.md @@ -93,13 +93,8 @@ * mybatis-plus 配置 *

* - * @package: com.xkcoding.orm.mybatis.plus.config - * @description: mybatis-plus 配置 - * @author: yangkai.shen - * @date: Created in 2018/11/8 17:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 17:29 */ @Configuration @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.plus.mapper"}) @@ -140,13 +135,8 @@ import java.util.Date; * 通用字段填充 *

* - * @package: com.xkcoding.orm.mybatis.plus.config - * @description: 通用字段填充 - * @author: yangkai.shen - * @date: Created in 2018/11/8 17:40 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 17:40 */ @Slf4j @Component @@ -231,13 +221,8 @@ mybatis-plus: * UserMapper *

* - * @package: com.xkcoding.orm.mybatis.plus.mapper - * @description: UserMapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 16:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 16:57 */ @Component public interface UserMapper extends BaseMapper { @@ -252,13 +237,8 @@ public interface UserMapper extends BaseMapper { * User Service *

* - * @package: com.xkcoding.orm.mybatis.plus.service - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:10 */ public interface UserService extends IService { } @@ -272,13 +252,8 @@ public interface UserService extends IService { * User Service *

* - * @package: com.xkcoding.orm.mybatis.plus.service.impl - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:10 */ @Service public class UserServiceImpl extends ServiceImpl implements UserService { @@ -293,13 +268,8 @@ public class UserServiceImpl extends ServiceImpl implements Us * User Service 测试 *

* - * @package: com.xkcoding.orm.mybatis.plus.service - * @description: User Service 测试 - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:13 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:13 */ @Slf4j public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTests { @@ -435,7 +405,7 @@ public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTest *

* * @author yangkai.shen - * @date Created in 2019/9/16 14:04 + * @date Created in 2019-09-16 14:04 */ @Data @TableName("orm_role") @@ -473,7 +443,7 @@ public class Role extends Model { *

* * @author yangkai.shen - * @date Created in 2019/9/16 14:06 + * @date Created in 2019-09-16 14:06 */ public interface RoleMapper extends BaseMapper { } @@ -488,7 +458,7 @@ public interface RoleMapper extends BaseMapper { *

* * @author yangkai.shen - * @date Created in 2019/9/16 14:19 + * @date Created in 2019-09-16 14:19 */ @Slf4j public class ActiveRecordTest extends SpringBootDemoOrmMybatisPlusApplicationTests { diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java index 9b908b2d2..5919a429b 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java @@ -1,6 +1,5 @@ package com.xkcoding.orm.mybatis.plus; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.orm.mybatis.plus - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/8 16:48 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 16:48 */ @SpringBootApplication public class SpringBootDemoOrmMybatisPlusApplication { diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java index 77584eb21..59991b29f 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java @@ -12,13 +12,8 @@ * 通用字段填充 *

* - * @package: com.xkcoding.orm.mybatis.plus.config - * @description: 通用字段填充 - * @author: yangkai.shen - * @date: Created in 2018/11/8 17:40 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 17:40 */ @Slf4j @Component diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java index 4d6f8467e..6b9a5954d 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java @@ -12,13 +12,8 @@ * mybatis-plus 配置 *

* - * @package: com.xkcoding.orm.mybatis.plus.config - * @description: mybatis-plus 配置 - * @author: yangkai.shen - * @date: Created in 2018/11/8 17:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 17:29 */ @Configuration @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.plus.mapper"}) diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java index 074fc0e6d..8eee1fca8 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java @@ -14,7 +14,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/14 14:04 + * @date Created in 2019-09-14 14:04 */ @Data @TableName("orm_role") diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java index afa560a33..6ce14a45e 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java @@ -18,13 +18,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.mybatis.plus.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 16:49 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 16:49 */ @Data @NoArgsConstructor diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java index 02408490a..c5953096f 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java @@ -9,7 +9,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/14 14:06 + * @date Created in 2019-09-14 14:06 */ public interface RoleMapper extends BaseMapper { } diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java index 4bb44b4dd..028507def 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java @@ -9,13 +9,8 @@ * UserMapper *

* - * @package: com.xkcoding.orm.mybatis.plus.mapper - * @description: UserMapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 16:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 16:57 */ @Component public interface UserMapper extends BaseMapper { diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java index bb357bbf7..8215a83e0 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java @@ -8,13 +8,8 @@ * User Service *

* - * @package: com.xkcoding.orm.mybatis.plus.service - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:10 */ public interface UserService extends IService { } diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java index 5afb5f79b..535d95567 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java @@ -11,13 +11,8 @@ * User Service *

* - * @package: com.xkcoding.orm.mybatis.plus.service.impl - * @description: User Service - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:10 */ @Service public class UserServiceImpl extends ServiceImpl implements UserService { diff --git a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java index 426b0efdd..1bfc9811b 100644 --- a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java +++ b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java @@ -16,7 +16,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/14 14:19 + * @date Created in 2019-09-14 14:19 */ @Slf4j public class ActiveRecordTest extends SpringBootDemoOrmMybatisPlusApplicationTests { diff --git a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java index d1bf23fa3..6ea2d3787 100644 --- a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java +++ b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xkcoding.orm.mybatis.plus.SpringBootDemoOrmMybatisPlusApplicationTests; import com.xkcoding.orm.mybatis.plus.entity.User; -import com.xkcoding.orm.mybatis.plus.service.UserService; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.Lists; import org.junit.Assert; @@ -24,13 +23,8 @@ * User Service 测试 *

* - * @package: com.xkcoding.orm.mybatis.plus.service - * @description: User Service 测试 - * @author: yangkai.shen - * @date: Created in 2018/11/8 18:13 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 18:13 */ @Slf4j public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTests { @@ -150,4 +144,4 @@ private void initData() { testSaveList(); } -} \ No newline at end of file +} diff --git a/demo-orm-mybatis/README.md b/demo-orm-mybatis/README.md index c6d6ab567..e8c16eb4c 100644 --- a/demo-orm-mybatis/README.md +++ b/demo-orm-mybatis/README.md @@ -86,13 +86,8 @@ * 启动类 *

* - * @package: com.xkcoding.orm.mybatis - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 10:52 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 10:52 */ @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.mapper"}) @SpringBootApplication @@ -149,13 +144,8 @@ mybatis: * User Mapper *

* - * @package: com.xkcoding.orm.mybatis.mapper - * @description: User Mapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 10:54 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 10:54 */ @Mapper @Component @@ -241,13 +231,8 @@ public interface UserMapper { * UserMapper 测试类 *

* - * @package: com.xkcoding.orm.mybatis.mapper - * @description: UserMapper 测试类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 11:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 11:25 */ @Slf4j public class UserMapperTest extends SpringBootDemoOrmMybatisApplicationTests { diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java index 27e2ba0f9..dc6240665 100644 --- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java +++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java @@ -9,13 +9,8 @@ * 启动类 *

* - * @package: com.xkcoding.orm.mybatis - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 10:52 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 10:52 */ @MapperScan(basePackages = {"com.xkcoding.orm.mybatis.mapper"}) @SpringBootApplication diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java index 21c9d8822..d361be0f8 100644 --- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java +++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java @@ -13,13 +13,8 @@ * 用户实体类 *

* - * @package: com.xkcoding.orm.mybatis.entity - * @description: 用户实体类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 10:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 10:58 */ @Data @NoArgsConstructor diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java index b76ac3200..796fdfddf 100644 --- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java +++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java @@ -13,13 +13,8 @@ * User Mapper *

* - * @package: com.xkcoding.orm.mybatis.mapper - * @description: User Mapper - * @author: yangkai.shen - * @date: Created in 2018/11/8 10:54 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 10:54 */ @Mapper @Component diff --git a/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java index 4d29f0259..c25000f2c 100644 --- a/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java +++ b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java @@ -18,13 +18,8 @@ * UserMapper 测试类 *

* - * @package: com.xkcoding.orm.mybatis.mapper - * @description: UserMapper 测试类 - * @author: yangkai.shen - * @date: Created in 2018/11/8 11:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-08 11:25 */ @Slf4j public class UserMapperTest extends SpringBootDemoOrmMybatisApplicationTests { @@ -70,4 +65,4 @@ public void deleteById() { int i = userMapper.deleteById(1L); Assert.assertEquals(1, i); } -} \ No newline at end of file +} diff --git a/demo-properties/README.md b/demo-properties/README.md index 17a969b12..f326bef9c 100644 --- a/demo-properties/README.md +++ b/demo-properties/README.md @@ -84,13 +84,8 @@ * 项目配置 *

* - * @package: com.xkcoding.properties.property - * @description: 项目配置 - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:50 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:50 */ @Data @Component @@ -110,13 +105,8 @@ public class ApplicationProperty { * 开发人员配置信息 *

* - * @package: com.xkcoding.properties.property - * @description: 开发人员配置信息 - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:51 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:51 */ @Data @ConfigurationProperties(prefix = "developer") @@ -137,13 +127,8 @@ public class DeveloperProperty { * 测试Controller *

* - * @package: com.xkcoding.properties.controller - * @description: 测试Controller - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:49 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:49 */ @RestController public class PropertyController { diff --git a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java index 93c0feb78..c2b1f018c 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.properties - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:48 AM - * @copyright: Copyright (c)2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:48 */ @SpringBootApplication public class SpringBootDemoPropertiesApplication { diff --git a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java index 5e7b49c8f..b676181cf 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java @@ -12,13 +12,8 @@ * 测试Controller *

* - * @package: com.xkcoding.properties.controller - * @description: 测试Controller - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:49 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:49 */ @RestController public class PropertyController { diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java index 0ae920d29..8ccf55d67 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java @@ -9,13 +9,8 @@ * 项目配置 *

* - * @package: com.xkcoding.properties.property - * @description: 项目配置 - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:50 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:50 */ @Data @Component diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java index d8c486f2c..a226940d5 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java @@ -9,13 +9,8 @@ * 开发人员配置信息 *

* - * @package: com.xkcoding.properties.property - * @description: 开发人员配置信息 - * @author: yangkai.shen - * @date: Created in 2018/9/29 10:51 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-09-29 10:51 */ @Data @ConfigurationProperties(prefix = "developer") diff --git a/demo-ratelimit-guava/README.md b/demo-ratelimit-guava/README.md index 1b4e91b9e..896041fe8 100644 --- a/demo-ratelimit-guava/README.md +++ b/demo-ratelimit-guava/README.md @@ -88,7 +88,7 @@ * 限流注解,添加了 {@link AliasFor} 必须通过 {@link AnnotationUtils} 获取,才会生效 * * @author yangkai.shen - * @date Created in 2019/9/12 14:14 + * @date Created in 2019-09-12 14:14 * @see AnnotationUtils *

*/ @@ -129,7 +129,7 @@ public @interface RateLimiter { *

* * @author yangkai.shen - * @date Created in 2019/9/12 14:27 + * @date Created in 2019-09-12 14:27 */ @Slf4j @Aspect @@ -175,7 +175,7 @@ public class RateLimiterAspect { *

* * @author yangkai.shen - * @date Created in 2019/9/12 14:22 + * @date Created in 2019-09-12 14:22 */ @Slf4j @RestController diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java index 39564bf2e..f99ff75f1 100644 --- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java +++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java @@ -9,7 +9,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/12 14:06 + * @date Created in 2019-09-12 14:06 */ @SpringBootApplication public class SpringBootDemoRatelimitGuavaApplication { diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java index 6c3519230..35bb0ddeb 100644 --- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java +++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java @@ -11,7 +11,7 @@ * 限流注解,添加了 {@link AliasFor} 必须通过 {@link AnnotationUtils} 获取,才会生效 * * @author yangkai.shen - * @date Created in 2019/9/12 14:14 + * @date Created in 2019-09-12 14:14 * @see AnnotationUtils *

*/ diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java index d204a12cc..98ccd4a29 100644 --- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java +++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java @@ -20,7 +20,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/12 14:27 + * @date Created in 2019-09-12 14:27 */ @Slf4j @Aspect diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java index 66c3eb649..5ccb2b3d2 100644 --- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java +++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java @@ -12,7 +12,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/12 14:22 + * @date Created in 2019-09-12 14:22 */ @Slf4j @RestController diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java index 3317c4312..85f9bfae8 100644 --- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java +++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java @@ -10,7 +10,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/12 15:00 + * @date Created in 2019-09-12 15:00 */ @RestControllerAdvice public class GlobalExceptionHandler { diff --git a/demo-ratelimit-redis/README.md b/demo-ratelimit-redis/README.md index e23db4e42..7564ac34f 100644 --- a/demo-ratelimit-redis/README.md +++ b/demo-ratelimit-redis/README.md @@ -93,7 +93,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:31 + * @date Created in 2019-09-30 10:31 * @see AnnotationUtils */ @Target(ElementType.METHOD) @@ -138,7 +138,7 @@ public @interface RateLimiter { *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:30 + * @date Created in 2019-09-30 10:30 */ @Slf4j @Aspect @@ -250,7 +250,7 @@ end *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:30 + * @date Created in 2019-09-30 10:30 */ @Slf4j @RestController diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java index 76330b805..43cb5f2d8 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java @@ -9,7 +9,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 09:32 + * @date Created in 2019-09-30 09:32 */ @SpringBootApplication public class SpringBootDemoRatelimitRedisApplication { diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java index dda095482..459b0bcbb 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java @@ -12,7 +12,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:31 + * @date Created in 2019-09-30 10:31 * @see AnnotationUtils */ @Target(ElementType.METHOD) diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java index 4566dfb3d..d69b3bcad 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java @@ -27,7 +27,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:30 + * @date Created in 2019-09-30 10:30 */ @Slf4j @Aspect diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java index d155b582e..6716388bc 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java @@ -13,7 +13,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 11:37 + * @date Created in 2019-09-30 11:37 */ @Configuration public class RedisConfig { diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java index da4f92ec1..fb1aab3c5 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java @@ -12,7 +12,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:30 + * @date Created in 2019-09-30 10:30 */ @Slf4j @RestController diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java index 30bdb31b7..f0b67f0fc 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java @@ -11,7 +11,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:30 + * @date Created in 2019-09-30 10:30 */ @Slf4j @RestControllerAdvice diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java index ff2fd39ba..c6c2e337d 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java @@ -13,7 +13,7 @@ *

* * @author yangkai.shen - * @date Created in 2019/9/30 10:38 + * @date Created in 2019-09-30 10:38 */ @Slf4j public class IpUtil { diff --git a/demo-rbac-security/README.md b/demo-rbac-security/README.md index bd7907e09..5f4660246 100644 --- a/demo-rbac-security/README.md +++ b/demo-rbac-security/README.md @@ -10,7 +10,7 @@ - [x] 持久化技术使用 `spring-data-jpa` 完成 - [x] 使用 `JWT` 实现安全验证,同时引入 `Redis` 解决 `JWT` 无法手动设置过期的弊端,并且保证同一用户在同一时间仅支持同一设备登录,不同设备登录会将,详情参考 [`JwtUtil.java`](./src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java) - [x] 在线人数统计,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java) 和 [`RedisUtil.java`](./src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java) -- [x] 手动踢出用户,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java) +- [x] 手动踢出用户,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java) - [x] 自定义配置不需要进行拦截的请求,详情参考 [`CustomConfig.java`](./src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java) 和 [`application.yml`](./src/main/resources/application.yml) ## 2. 运行 @@ -146,13 +146,8 @@ * JWT 工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: JWT 工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-07 13:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 13:42 */ @EnableConfigurationProperties(JwtConfig.class) @Configuration @@ -306,13 +301,8 @@ public class JwtUtil { * Security 配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: Security 配置 - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:46 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:46 */ @Configuration @EnableWebSecurity @@ -471,13 +461,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * 动态路由认证 *

* - * @package: com.xkcoding.rbac.security.config - * @description: 动态路由认证 - * @author: yangkai.shen - * @date: Created in 2018-12-10 17:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 17:17 */ @Component public class RbacAuthorityService { @@ -601,13 +586,8 @@ public class RbacAuthorityService { * Jwt 认证过滤器 *

* - * @package: com.xkcoding.rbac.security.config - * @description: Jwt 认证过滤器 - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:15 */ @Component @Slf4j @@ -732,13 +712,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { * 自定义UserDetails查询 *

* - * @package: com.xkcoding.rbac.security.service - * @description: 自定义UserDetails查询 - * @author: yangkai.shen - * @date: Created in 2018-12-10 10:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 10:29 */ @Service public class CustomUserDetailsService implements UserDetailsService { @@ -775,13 +750,8 @@ public class CustomUserDetailsService implements UserDetailsService { * Redis工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: Redis工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-11 20:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 20:24 */ @Component @Slf4j @@ -856,13 +826,8 @@ import java.util.stream.Collectors; * 监控 Service *

* - * @package: com.xkcoding.rbac.security.service - * @description: 监控 Service - * @author: yangkai.shen - * @date: Created in 2018-12-12 00:55 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 00:55 */ @Service public class MonitorService { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java index 5b8cef02a..621d5e8a0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.rbac.security - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:28 */ @SpringBootApplication public class SpringBootDemoRbacSecurityApplication { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java index 8d743c32f..59e1985bc 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java @@ -9,13 +9,8 @@ * 通用的 API 接口封装 *

* - * @package: com.xkcoding.rbac.security.common - * @description: 通用的 API 接口封装 - * @author: yangkai.shen - * @date: Created in 2018-12-07 14:55 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 14:55 */ @Data public class ApiResponse implements Serializable { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java index 90547ef76..24f7937b9 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java @@ -8,13 +8,8 @@ * 异常基类 *

* - * @package: com.xkcoding.rbac.security.common - * @description: 异常基类 - * @author: yangkai.shen - * @date: Created in 2018-12-07 14:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 14:57 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java index 8e973737c..754cfb2d0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java @@ -5,13 +5,8 @@ * 常量池 *

* - * @package: com.xkcoding.rbac.security.common - * @description: 常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:03 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:03 */ public interface Consts { /** diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java index eefd3a228..f6f58c19e 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java @@ -5,13 +5,8 @@ * REST API 错误码接口 *

* - * @package: com.xkcoding.rbac.security.common - * @description: REST API 错误码接口 - * @author: yangkai.shen - * @date: Created in 2018-12-07 14:35 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 14:35 */ public interface IStatus { @@ -29,4 +24,4 @@ public interface IStatus { */ String getMessage(); -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java index 4a2307e12..e81f05ff9 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java @@ -12,13 +12,8 @@ * 通用分页参数返回 *

* - * @package: com.xkcoding.rbac.security.common - * @description: 通用分页参数返回 - * @author: yangkai.shen - * @date: Created in 2018-12-11 20:26 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 20:26 */ @Data @NoArgsConstructor diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java index 23a194ea7..192ffd3ef 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java @@ -7,13 +7,8 @@ * 通用状态码 *

* - * @package: com.xkcoding.rbac.security.common - * @description: 通用状态码 - * @author: yangkai.shen - * @date: Created in 2018-12-07 14:31 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 14:31 */ @Getter public enum Status implements IStatus { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java index 32f3cf719..bac88268f 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java @@ -8,13 +8,8 @@ * 自定义配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: 自定义配置 - * @author: yangkai.shen - * @date: Created in 2018-12-13 10:56 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-13 10:56 */ @ConfigurationProperties(prefix = "custom.config") @Data diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java index d25738a19..7723ded25 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java @@ -10,13 +10,8 @@ * 雪花主键生成器 *

* - * @package: com.xkcoding.rbac.security.config - * @description: 雪花主键生成器 - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:28 */ @Configuration public class IdConfig { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java index 2bbc40f0b..becfacdf5 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java @@ -10,13 +10,8 @@ * 忽略配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: 忽略配置 - * @author: yangkai.shen - * @date: Created in 2018-12-17 17:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-17 17:37 */ @Data public class IgnoreConfig { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java index 165d23050..910496127 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java @@ -32,13 +32,8 @@ * Jwt 认证过滤器 *

* - * @package: com.xkcoding.rbac.security.config - * @description: Jwt 认证过滤器 - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:15 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:15 */ @Component @Slf4j diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java index 1cc098801..d75e3e33f 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java @@ -8,13 +8,8 @@ * JWT 配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: JWT 配置 - * @author: yangkai.shen - * @date: Created in 2018-12-07 13:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 13:42 */ @ConfigurationProperties(prefix = "jwt.config") @Data diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java index 1c250127d..555996dd0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java @@ -33,13 +33,8 @@ * 动态路由认证 *

* - * @package: com.xkcoding.rbac.security.config - * @description: 动态路由认证 - * @author: yangkai.shen - * @date: Created in 2018-12-10 17:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 17:17 */ @Component public class RbacAuthorityService { @@ -147,4 +142,4 @@ private Multimap allUrlMapping() { return urlMapping; } -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java index 5ab166e3f..4a0ea93cc 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java @@ -17,13 +17,8 @@ * redis配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: redis配置 - * @author: yangkai.shen - * @date: Created in 2018-12-11 15:16 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 15:16 */ @Configuration @AutoConfigureAfter(RedisAutoConfiguration.class) diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java index a9bf36e30..2b2d75fb3 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java @@ -22,13 +22,8 @@ * Security 配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: Security 配置 - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:46 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:46 */ @Configuration @EnableWebSecurity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java index 2db9de8fc..888f5ae49 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java @@ -11,13 +11,8 @@ * Security 结果处理配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: Security 结果处理配置 - * @author: yangkai.shen - * @date: Created in 2018-12-07 17:31 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 17:31 */ @Configuration public class SecurityHandlerConfig { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java index cffb3fa0a..9e7ce1390 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java @@ -9,13 +9,8 @@ * MVC配置 *

* - * @package: com.xkcoding.rbac.security.config - * @description: MVC配置 - * @author: yangkai.shen - * @date: Created in 2018-12-10 16:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 16:09 */ @Configuration public class WebMvcConfig implements WebMvcConfigurer { @@ -29,4 +24,4 @@ public void addCorsMappings(CorsRegistry registry) { .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE") .maxAge(MAX_AGE_SECS); } -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java index 6e5f5784d..acaa99147 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java @@ -8,7 +8,6 @@ import com.xkcoding.rbac.security.vo.JwtResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -26,13 +25,8 @@ * 认证 Controller,包括用户注册,用户登录请求 *

* - * @package: com.xkcoding.rbac.security.controller - * @description: 认证 Controller,包括用户注册,用户登录请求 - * @author: yangkai.shen - * @date: Created in 2018-12-07 17:23 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 17:23 */ @Slf4j @RestController diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java index c254f7729..57fcf670b 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java @@ -21,13 +21,8 @@ * 监控 Controller,在线用户,手动踢出用户等功能 *

* - * @package: com.xkcoding.rbac.security.controller - * @description: 监控 Controller,在线用户,手动踢出用户等功能 - * @author: yangkai.shen - * @date: Created in 2018-12-11 20:55 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 20:55 */ @Slf4j @RestController diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java index da05212ea..764cfdf82 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java @@ -9,13 +9,8 @@ * 测试Controller *

* - * @package: com.xkcoding.rbac.security.controller - * @description: 测试Controller - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:44 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:44 */ @Slf4j @RestController diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java index 4b02465b6..f1e7ffb3b 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java @@ -10,13 +10,8 @@ * 全局异常 *

* - * @package: com.xkcoding.rbac.security.exception - * @description: 全局异常 - * @author: yangkai.shen - * @date: Created in 2018-12-10 17:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 17:24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java index 909638c2e..8e7d4da22 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java @@ -24,13 +24,8 @@ * 全局统一异常处理 *

* - * @package: com.xkcoding.rbac.security.exception.handler - * @description: 全局统一异常处理 - * @author: yangkai.shen - * @date: Created in 2018-12-10 17:00 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 17:00 */ @ControllerAdvice @Slf4j diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java index 1c2c5df22..d0569cc62 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java @@ -12,13 +12,8 @@ * 权限 *

* - * @package: com.xkcoding.rbac.security.model - * @description: 权限 - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:04 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:04 */ @Data @Entity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java index 4ed5764bf..ed17c0a50 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java @@ -12,13 +12,8 @@ * 角色 *

* - * @package: com.xkcoding.rbac.security.model - * @description: 角色 - * @author: yangkai.shen - * @date: Created in 2018-12-07 15:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 15:45 */ @Data @Entity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java index 3705d8fa9..21d5e498d 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java @@ -12,13 +12,8 @@ * 角色-权限 *

* - * @package: com.xkcoding.rbac.security.model - * @description: 角色-权限 - * @author: yangkai.shen - * @date: Created in 2018-12-10 13:46 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 13:46 */ @Data @Entity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java index f5db78cc5..ddecc7573 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java @@ -12,13 +12,8 @@ * 用户 *

* - * @package: com.xkcoding.rbac.security.model - * @description: 用户 - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:00 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:00 */ @Data @Entity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java index af3898466..2ca084d83 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java @@ -12,13 +12,8 @@ * 用户角色关联 *

* - * @package: com.xkcoding.rbac.security.model - * @description: 用户角色关联 - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:18 */ @Data @Entity diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java index 8837ca80f..7216c8bbb 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java @@ -11,13 +11,8 @@ * 角色-权限联合主键 *

* - * @package: com.xkcoding.rbac.security.model.unionkey - * @description: 角色-权限联合主键 - * @author: yangkai.shen - * @date: Created in 2018-12-10 13:47 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 13:47 */ @Data @Embeddable diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java index bc9d548ba..c3c61d563 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java @@ -11,19 +11,14 @@ * 用户-角色联合主键 *

* - * @package: com.xkcoding.rbac.security.model.unionkey - * @description: 用户-角色联合主键 - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:20 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:20 */ @Embeddable @Data public class UserRoleKey implements Serializable { private static final long serialVersionUID = 5633412144183654743L; - + /** * 用户id */ diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java index 3c9a0c53c..92d0baadb 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java @@ -9,13 +9,8 @@ * 登录请求参数 *

* - * @package: com.xkcoding.rbac.security.payload - * @description: 登录请求参数 - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:52 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:52 */ @Data public class LoginRequest { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java index bcdf201dc..dba46aef6 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java @@ -7,13 +7,8 @@ * 分页请求参数 *

* - * @package: com.xkcoding.rbac.security.payload - * @description: 分页请求参数 - * @author: yangkai.shen - * @date: Created in 2018-12-12 18:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 18:05 */ @Data public class PageCondition { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java index 6f7dc0580..f911dc9bc 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java @@ -13,13 +13,8 @@ * 权限 DAO *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 权限 DAO - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:21 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:21 */ public interface PermissionDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java index 0dba9e8b9..cdb9de958 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java @@ -13,13 +13,8 @@ * 角色 DAO *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 角色 DAO - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:20 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:20 */ public interface RoleDao extends JpaRepository, JpaSpecificationExecutor { /** diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java index 21e749150..e41a25043 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java @@ -10,13 +10,8 @@ * 角色-权限 DAO *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 角色-权限 DAO - * @author: yangkai.shen - * @date: Created in 2018-12-10 13:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 13:45 */ public interface RolePermissionDao extends JpaRepository, JpaSpecificationExecutor { } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java index 45b30e9ba..64cda75f6 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java @@ -12,13 +12,8 @@ * 用户 DAO *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 用户 DAO - * @author: yangkai.shen - * @date: Created in 2018-12-07 16:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 16:18 */ public interface UserDao extends JpaRepository, JpaSpecificationExecutor { /** diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java index e9d1f1feb..7f0a932c6 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java @@ -10,13 +10,8 @@ * 用户角色 DAO *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 用户角色 DAO - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:24 */ public interface UserRoleDao extends JpaRepository, JpaSpecificationExecutor { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java index e153056c4..6b03a0510 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java @@ -21,13 +21,8 @@ * 自定义UserDetails查询 *

* - * @package: com.xkcoding.rbac.security.service - * @description: 自定义UserDetails查询 - * @author: yangkai.shen - * @date: Created in 2018-12-10 10:29 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 10:29 */ @Service public class CustomUserDetailsService implements UserDetailsService { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java index 739a683af..d2cfdfdd0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java @@ -22,13 +22,8 @@ * 监控 Service *

* - * @package: com.xkcoding.rbac.security.service - * @description: 监控 Service - * @author: yangkai.shen - * @date: Created in 2018-12-12 00:55 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 00:55 */ @Slf4j @Service diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java index 305279c87..387b1c83e 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java @@ -28,13 +28,8 @@ * JWT 工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: JWT 工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-07 13:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 13:42 */ @EnableConfigurationProperties(JwtConfig.class) @Configuration diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java index fecd3c39a..a67606141 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java @@ -11,13 +11,8 @@ * 分页工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: 分页工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-12 18:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 18:09 */ public class PageUtil { /** diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java index b8e14221f..21402d78d 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java @@ -20,13 +20,8 @@ * Redis工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: Redis工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-11 20:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 20:24 */ @Component @Slf4j diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java index 4987ecd6a..73b1d28e0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java @@ -15,13 +15,8 @@ * Response 通用工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: Response 通用工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-07 17:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-07 17:37 */ @Slf4j public class ResponseUtil { @@ -70,4 +65,4 @@ public static void renderJson(HttpServletResponse response, BaseException except log.error("Response写出JSON异常,", e); } } -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java index 402e5f876..8b73ed176 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java @@ -11,13 +11,8 @@ * Spring Security工具类 *

* - * @package: com.xkcoding.rbac.security.util - * @description: Spring Security工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-12 18:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 18:30 */ public class SecurityUtil { /** diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java index f403dd421..c052f04de 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java @@ -9,13 +9,8 @@ * JWT 响应返回 *

* - * @package: com.xkcoding.rbac.security.vo - * @description: JWT 响应返回 - * @author: yangkai.shen - * @date: Created in 2018-12-10 16:01 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 16:01 */ @Data @NoArgsConstructor diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java index 2d0268bcf..190a8fe22 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java @@ -11,13 +11,8 @@ * 在线用户 VO *

* - * @package: com.xkcoding.rbac.security.vo - * @description: 在线用户 VO - * @author: yangkai.shen - * @date: Created in 2018-12-12 00:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 00:58 */ @Data public class OnlineUser { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java index b244eaee6..88ebd124b 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java @@ -23,13 +23,8 @@ * 自定义User *

* - * @package: com.xkcoding.rbac.security.vo - * @description: 自定义User - * @author: yangkai.shen - * @date: Created in 2018-12-10 15:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 15:09 */ @Data @NoArgsConstructor @@ -148,4 +143,4 @@ public boolean isCredentialsNonExpired() { public boolean isEnabled() { return Objects.equals(this.status, Consts.ENABLE); } -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java index 3d27d96b7..3dab200ec 100644 --- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java +++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java @@ -16,13 +16,8 @@ * 数据初始化测试 *

* - * @package: com.xkcoding.rbac.security.repository - * @description: 数据初始化测试 - * @author: yangkai.shen - * @date: Created in 2018-12-10 11:26 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-10 11:26 */ public class DataInitTest extends SpringBootDemoRbacSecurityApplicationTests { @Autowired diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java index 1c9bdb150..d05d2bc42 100644 --- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java +++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java @@ -9,20 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import java.util.Optional; /** *

* UserDao 测试 *

* - * @package: com.xkcoding.rbac.security.repository - * @description: UserDao 测试 - * @author: yangkai.shen - * @date: Created in 2018-12-12 01:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 01:10 */ @Slf4j public class UserDaoTest extends SpringBootDemoRbacSecurityApplicationTests { @@ -36,4 +30,4 @@ public void findByUsernameIn() { Assert.assertEquals(2, userList.size()); log.info("【userList】= {}", userList); } -} \ No newline at end of file +} diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java index cbe51abfe..7706f9323 100644 --- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java +++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java @@ -13,13 +13,8 @@ * 测试RedisUtil *

* - * @package: com.xkcoding.rbac.security.util - * @description: 测试RedisUtil - * @author: yangkai.shen - * @date: Created in 2018-12-11 20:44 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-11 20:44 */ @Slf4j public class RedisUtilTest extends SpringBootDemoRbacSecurityApplicationTests { @@ -31,4 +26,4 @@ public void findKeysForPage() { PageResult pageResult = redisUtil.findKeysForPage(Consts.REDIS_JWT_KEY_PREFIX + Consts.SYMBOL_STAR, 2, 1); log.info("【pageResult】= {}", JSONUtil.toJsonStr(pageResult)); } -} \ No newline at end of file +} diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java index 615965596..df7c6b182 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.rbac.shiro - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:11 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:11 */ @SpringBootApplication @MapperScan("com.xkcoding.rbac.shiro.mapper") diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java index cadc3c632..17ff7baff 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java @@ -5,13 +5,8 @@ * 统一状态码接口 *

* - * @package: com.xkcoding.rbac.shiro.common - * @description: 统一状态码接口 - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:28 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:28 */ public interface IResultCode { /** diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java index 8d5e97a1a..4cd5f00ff 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java @@ -8,13 +8,8 @@ * 统一API对象返回 *

* - * @package: com.xkcoding.rbac.shiro.common - * @description: 统一API对象返回 - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:24 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:24 */ @Data @NoArgsConstructor diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java index 871635ec1..1f0236fbf 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java @@ -7,13 +7,8 @@ * 通用状态枚举 *

* - * @package: com.xkcoding.rbac.shiro.common - * @description: 通用状态枚举 - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:31 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:31 */ @Getter public enum ResultCode implements IResultCode { diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java index 3faf11a7f..9cf6d4e6a 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java @@ -15,13 +15,8 @@ * MP3 配置 *

* - * @package: com.xkcoding.rbac.shiro.config - * @description: MP3 配置 - * @author: yangkai.shen - * @date: Created in 2019-03-21 17:06 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 17:06 */ @Configuration public class MybatisPlusConfig { diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java index 59f6d9c1b..654f7cd5f 100644 --- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java +++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java @@ -10,13 +10,8 @@ * 测试Controller *

* - * @package: com.xkcoding.rbac.shiro.controller - * @description: 测试Controller - * @author: yangkai.shen - * @date: Created in 2019-03-21 16:13 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-21 16:13 */ @RestController @RequestMapping("/test") diff --git a/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java b/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java index 2834699ee..e22efcc9a 100644 --- a/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java +++ b/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.session - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018-12-19 19:35 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 19:35 */ @SpringBootApplication public class SpringBootDemoSessionApplication { diff --git a/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java b/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java index 25289357c..0a5f79b15 100644 --- a/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java +++ b/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java @@ -12,13 +12,8 @@ * WebMvc 配置类 *

* - * @package: com.xkcoding.session.config - * @description: WebMvc 配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-19 19:50 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 19:50 */ @Configuration public class WebMvcConfig implements WebMvcConfigurer { diff --git a/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java b/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java index 38cf8f3c0..d8a28fed4 100644 --- a/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java +++ b/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java @@ -5,13 +5,8 @@ * 常量池 *

* - * @package: com.xkcoding.session.constants - * @description: 常量池 - * @author: yangkai.shen - * @date: Created in 2018-12-19 19:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 19:42 */ public interface Consts { /** diff --git a/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java b/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java index d6b4756d5..64cf9297d 100644 --- a/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java +++ b/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java @@ -16,13 +16,8 @@ * 页面跳转 Controller *

* - * @package: com.xkcoding.session.controller - * @description: 页面跳转 Controller - * @author: yangkai.shen - * @date: Created in 2018-12-19 19:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 19:57 */ @Controller @RequestMapping("/page") diff --git a/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java b/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java index c79765539..204106ddf 100644 --- a/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java +++ b/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java @@ -13,13 +13,8 @@ * 校验Session的拦截器 *

* - * @package: com.xkcoding.session.interceptor - * @description: 校验Session的拦截器 - * @author: yangkai.shen - * @date: Created in 2018-12-19 19:40 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 19:40 */ @Component public class SessionInterceptor extends HandlerInterceptorAdapter { diff --git a/demo-sharding-jdbc/README.md b/demo-sharding-jdbc/README.md index c4450029b..733d7dfb7 100644 --- a/demo-sharding-jdbc/README.md +++ b/demo-sharding-jdbc/README.md @@ -110,13 +110,8 @@ import io.shardingsphere.core.keygen.KeyGenerator; * 自定义雪花算法,替换 DefaultKeyGenerator,避免DefaultKeyGenerator生成的id大几率是偶数 *

* - * @package: com.xkcoding.sharding.jdbc.config - * @description: 自定义雪花算法,替换 DefaultKeyGenerator,避免DefaultKeyGenerator生成的id大几率是偶数 - * @author: yangkai.shen - * @date: Created in 2019-03-26 17:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 17:07 */ public class CustomSnowflakeKeyGenerator implements KeyGenerator { private Snowflake snowflake; @@ -124,7 +119,7 @@ public class CustomSnowflakeKeyGenerator implements KeyGenerator { public CustomSnowflakeKeyGenerator(Snowflake snowflake) { this.snowflake = snowflake; } - + @Override public Number generateKey() { return snowflake.nextId(); @@ -140,13 +135,8 @@ public class CustomSnowflakeKeyGenerator implements KeyGenerator { * sharding-jdbc 的数据源配置 *

* - * @package: com.xkcoding.sharding.jdbc.config - * @description: sharding-jdbc 的数据源配置 - * @author: yangkai.shen - * @date: Created in 2019-03-26 16:47 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 16:47 */ @Configuration public class DataSourceShardingConfig { @@ -231,13 +221,8 @@ public class DataSourceShardingConfig { * 测试sharding-jdbc分库分表 *

* - * @package: com.xkcoding.sharding.jdbc - * @description: 测试sharding-jdbc分库分表 - * @author: yangkai.shen - * @date: Created in 2019-03-26 13:44 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 13:44 */ @Slf4j @RunWith(SpringRunner.class) @@ -285,11 +270,11 @@ public class SpringBootDemoShardingJdbcApplicationTests { List orders = orderMapper.selectList(Wrappers.query().lambda().in(Order::getOrderId, 1, 2)); log.info("【orders】= {}", JSONUtil.toJsonStr(orders)); } - + } ``` ## 3. 参考 1. `ShardingSphere` 官网:https://shardingsphere.apache.org/index_zh.html (虽然文档确实垃圾,但是还是得参考啊~) -2. `Mybatis-Plus` 语法参考官网:https://mybatis.plus/ \ No newline at end of file +2. `Mybatis-Plus` 语法参考官网:https://mybatis.plus/ diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java index 897d1f633..363dbd738 100644 --- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java +++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java @@ -3,7 +3,6 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -11,13 +10,8 @@ * 启动器 *

* - * @package: com.xkcoding.sharding.jdbc - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-01-23 22:05 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-01-23 22:05 */ @SpringBootApplication @EnableTransactionManagement(proxyTargetClass = true) diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java index 1ef1d11c6..667c4b0d7 100644 --- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java +++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java @@ -8,13 +8,8 @@ * 自定义雪花算法,替换 DefaultKeyGenerator,避免DefaultKeyGenerator生成的id大几率是偶数 *

* - * @package: com.xkcoding.sharding.jdbc.config - * @description: 自定义雪花算法,替换 DefaultKeyGenerator,避免DefaultKeyGenerator生成的id大几率是偶数 - * @author: yangkai.shen - * @date: Created in 2019-03-26 17:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 17:07 */ public class CustomSnowflakeKeyGenerator implements KeyGenerator { private Snowflake snowflake; diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java index 223650354..9aaecafef 100644 --- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java +++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java @@ -27,13 +27,8 @@ * sharding-jdbc 的数据源配置 *

* - * @package: com.xkcoding.sharding.jdbc.config - * @description: sharding-jdbc 的数据源配置 - * @author: yangkai.shen - * @date: Created in 2019-03-26 16:47 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 16:47 */ @Configuration public class DataSourceShardingConfig { diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java index d90027cee..41e218dce 100644 --- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java +++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java @@ -9,13 +9,8 @@ * 订单表 Mapper *

* - * @package: com.xkcoding.sharding.jdbc.mapper - * @description: 订单表 Mapper - * @author: yangkai.shen - * @date: Created in 2019-03-26 13:38 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 13:38 */ @Component public interface OrderMapper extends BaseMapper { diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java index 242930809..c497ff4b1 100644 --- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java +++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java @@ -11,13 +11,8 @@ * 订单表 *

* - * @package: com.xkcoding.sharding.jdbc.model - * @description: 订单表 - * @author: yangkai.shen - * @date: Created in 2019-03-26 13:35 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 13:35 */ @Data @NoArgsConstructor diff --git a/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java b/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java index a74c1997c..75a4c3195 100644 --- a/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java +++ b/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java @@ -20,13 +20,8 @@ * 测试sharding-jdbc分库分表 *

* - * @package: com.xkcoding.sharding.jdbc - * @description: 测试sharding-jdbc分库分表 - * @author: yangkai.shen - * @date: Created in 2019-03-26 13:44 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-03-26 13:44 */ @Slf4j @RunWith(SpringRunner.class) diff --git a/demo-social/README.md b/demo-social/README.md index 6355ef6b7..054b56b5d 100644 --- a/demo-social/README.md +++ b/demo-social/README.md @@ -8,7 +8,7 @@ > > 1. **全**:已集成十多家第三方平台(国内外常用的基本都已包含),后续依然还有扩展计划! >2. **简**:API就是奔着最简单去设计的(见后面[`快速开始`](https://github.com/zhangyd-c/JustAuth#%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B)),尽量让您用起来没有障碍感! -> +> >PS: 本人十分幸运的参与到了这个SDK的开发,主要开发了**QQ登录、微信登录、小米登录、微软登录、谷歌登录**这 **`5`** 个第三方登录,以及一些BUG的修复工作。再次感谢 [@母狼](https://github.com/zhangyd-c) 开源这个又好用又全面的第三方登录SDK。 如果技术选型是 `JFinal` 的,请查看此 [**`demo`**](https://github.com/xkcoding/jfinal-justauth-demo) @@ -50,9 +50,9 @@ https://github.com/xkcoding/act-justauth-demo ```shell $ cd frp_0.27.0_linux_amd64 $ vim frps.ini - - [common] - bind_port = 7100 + + [common] + bind_port = 7100 vhost_http_port = 7200 ``` @@ -86,11 +86,11 @@ https://github.com/xkcoding/act-justauth-demo ```shell $ cd frp_0.27.0_darwin_amd64 $ vim frpc.ini - + [common] server_addr = 120.92.169.103 server_port = 7100 - + [web] type = http local_port = 8080 @@ -119,25 +119,25 @@ nginx 的搭建就不在此赘述了,只说配置 ```nginx server { listen 80; - server_name oauth.xkcoding.com; - + server_name oauth.xkcoding.com; + location / { proxy_pass http://127.0.0.1:7200; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_buffering off; - sendfile off; - proxy_max_temp_file_size 0; - client_max_body_size 10m; - client_body_buffer_size 128k; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_temp_file_write_size 64k; - proxy_http_version 1.1; - proxy_request_buffering off; + proxy_set_header X-Real-IP $remote_addr; + proxy_buffering off; + sendfile off; + proxy_max_temp_file_size 0; + client_max_body_size 10m; + client_body_buffer_size 128k; + proxy_connect_timeout 90; + proxy_send_timeout 90; + proxy_read_timeout 90; + proxy_temp_file_write_size 64k; + proxy_http_version 1.1; + proxy_request_buffering off; } } ``` @@ -167,7 +167,7 @@ $ nginx -s reload #### 1.5.1. QQ互联平台申请 -1. 前往 https://connect.qq.com/ +1. 前往 https://connect.qq.com/ 2. 申请开发者 3. 应用管理 -> 添加网站应用,等待审核通过即可 @@ -237,7 +237,7 @@ $ nginx -s reload ## 2. 主要代码 -> 本 demo 采用 Redis 缓存 state,所以请准备 Redis 环境,如果没有 Redis 环境,可以将配置文件的缓存配置为 +> 本 demo 采用 Redis 缓存 state,所以请准备 Redis 环境,如果没有 Redis 环境,可以将配置文件的缓存配置为 > > ```yaml > justauth: @@ -408,13 +408,8 @@ justauth: * 第三方登录 Controller *

* - * @package: com.xkcoding.oauth.controller - * @description: 第三方登录 Controller - * @author: yangkai.shen - * @date: Created in 2019-05-17 10:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-05-17 10:07 */ @Slf4j @RestController diff --git a/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java b/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java index f780d3778..557fd51d1 100644 --- a/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java +++ b/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java @@ -27,13 +27,8 @@ * 第三方登录 Controller *

* - * @package: com.xkcoding.oauth.controller - * @description: 第三方登录 Controller - * @author: yangkai.shen - * @date: Created in 2019-05-17 10:07 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-05-17 10:07 */ @Slf4j @RestController diff --git a/demo-swagger-beauty/README.md b/demo-swagger-beauty/README.md index b63b09b03..b488af530 100644 --- a/demo-swagger-beauty/README.md +++ b/demo-swagger-beauty/README.md @@ -131,13 +131,8 @@ spring: * 通用API接口返回 *

* - * @package: com.xkcoding.swagger.beauty.common - * @description: 通用API接口返回 - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:18 */ @Data @Builder @@ -172,13 +167,8 @@ public class ApiResponse implements Serializable { * 用户实体 *

* - * @package: com.xkcoding.swagger.beauty.entity - * @description: 用户实体 - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:13 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:13 */ @Data @NoArgsConstructor @@ -212,13 +202,8 @@ public class User implements Serializable { * User Controller *

* - * @package: com.xkcoding.swagger.beauty.controller - * @description: User Controller - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:25 */ @RestController @RequestMapping("/user") @@ -294,4 +279,4 @@ public class UserController { - [battcn](https://github.com/battcn) 的 [swagger-spring-boot-starter](https://github.com/battcn/swagger-spring-boot) 文档:https://github.com/battcn/swagger-spring-boot/blob/master/README.md - [ swagger-ui-layer](https://gitee.com/caspar-chen/Swagger-UI-layer) 文档:https://gitee.com/caspar-chen/Swagger-UI-layer#%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8 - [swagger-bootstrap-ui](https://gitee.com/xiaoym/swagger-bootstrap-ui) 文档:https://gitee.com/xiaoym/swagger-bootstrap-ui#%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E - - [swagger-ui-themes](https://github.com/ostranme/swagger-ui-themes) 文档:https://github.com/ostranme/swagger-ui-themes#getting-started \ No newline at end of file + - [swagger-ui-themes](https://github.com/ostranme/swagger-ui-themes) 文档:https://github.com/ostranme/swagger-ui-themes#getting-started diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java index 6c23e904a..349509d58 100644 --- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java +++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.swagger.beauty - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-11-28 11:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 11:18 */ @SpringBootApplication public class SpringBootDemoSwaggerBeautyApplication { diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java index 43ce02a8f..f7ae5bd5c 100644 --- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java +++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java @@ -14,13 +14,8 @@ * 通用API接口返回 *

* - * @package: com.xkcoding.swagger.beauty.common - * @description: 通用API接口返回 - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:18 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:18 */ @Data @Builder diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java index f8667d19c..9fbb39de7 100644 --- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java +++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java @@ -19,13 +19,8 @@ * User Controller *

* - * @package: com.xkcoding.swagger.beauty.controller - * @description: User Controller - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:25 */ @RestController @RequestMapping("/user") diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java index 758afad01..3a7532338 100644 --- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java +++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java @@ -13,13 +13,8 @@ * 用户实体 *

* - * @package: com.xkcoding.swagger.beauty.entity - * @description: 用户实体 - * @author: yangkai.shen - * @date: Created in 2018-11-28 14:13 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-28 14:13 */ @Data @NoArgsConstructor diff --git a/demo-swagger/README.md b/demo-swagger/README.md index 960b4ae3a..77f3bd6cb 100644 --- a/demo-swagger/README.md +++ b/demo-swagger/README.md @@ -84,13 +84,8 @@ * Swagger2 配置 *

* - * @package: com.xkcoding.swagger.config - * @description: Swagger2 配置 - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:14 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:14 */ @Configuration @EnableSwagger2 @@ -126,13 +121,8 @@ public class Swagger2Config { * User Controller *

* - * @package: com.xkcoding.swagger.controller - * @description: User Controller - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:30 */ @RestController @RequestMapping("/user") @@ -217,13 +207,8 @@ public class UserController { * 通用API接口返回 *

* - * @package: com.xkcoding.swagger.common - * @description: 通用API接口返回 - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:30 */ @Data @Builder diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java b/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java index dbc1c7850..1f9dbae05 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.swagger - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-11-29 13:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 13:25 */ @SpringBootApplication public class SpringBootDemoSwaggerApplication { diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java index 523a8b6f7..fb726cd66 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java @@ -14,13 +14,8 @@ * 通用API接口返回 *

* - * @package: com.xkcoding.swagger.common - * @description: 通用API接口返回 - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:30 */ @Data @Builder diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java index 0caf4ae60..b5266a603 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java @@ -5,13 +5,8 @@ * 方便在 @ApiImplicitParam 的 dataType 属性使用 *

* - * @package: com.xkcoding.swagger.common - * @description: 方便在 @ApiImplicitParam 的 dataType 属性使用 - * @author: yangkai.shen - * @date: Created in 2018-11-29 13:23 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 13:23 */ public final class DataType { @@ -27,4 +22,4 @@ public final class DataType { public final static String DATETIME = "dateTime"; public final static String PASSWORD = "password"; -} \ No newline at end of file +} diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java index 438cea820..775ef6f65 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java @@ -5,13 +5,8 @@ * 方便在 @ApiImplicitParam 的 paramType 属性使用 *

* - * @package: com.xkcoding.swagger.common - * @description: 方便在 @ApiImplicitParam 的 paramType 属性使用 - * @author: yangkai.shen - * @date: Created in 2018-11-29 13:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 13:24 */ public final class ParamType { @@ -21,4 +16,4 @@ public final class ParamType { public final static String BODY = "body"; public final static String FORM = "form"; -} \ No newline at end of file +} diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java index 04d0924f8..b0a9d3c20 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java @@ -16,13 +16,8 @@ * Swagger2 配置 *

* - * @package: com.xkcoding.swagger.config - * @description: Swagger2 配置 - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:14 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:14 */ @Configuration @EnableSwagger2 @@ -45,4 +40,4 @@ private ApiInfo apiInfo() { .build(); } -} \ No newline at end of file +} diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java index db6cd1115..bbf71a269 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java @@ -19,13 +19,8 @@ * User Controller *

* - * @package: com.xkcoding.swagger.controller - * @description: User Controller - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:30 */ @RestController @RequestMapping("/user") diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java b/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java index 3862b9bd8..a89baeac0 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java @@ -13,13 +13,8 @@ * 用户实体 *

* - * @package: com.xkcoding.swagger.entity - * @description: 用户实体 - * @author: yangkai.shen - * @date: Created in 2018-11-29 11:31 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-29 11:31 */ @Data @NoArgsConstructor diff --git a/demo-task-quartz/init/dbTables/tables_db2.sql b/demo-task-quartz/init/dbTables/tables_db2.sql index f56ddda80..a8ebabd56 100644 --- a/demo-task-quartz/init/dbTables/tables_db2.sql +++ b/demo-task-quartz/init/dbTables/tables_db2.sql @@ -4,14 +4,14 @@ # .. known to work with DB2 7.1 and the JDBC driver "COM.ibm.db2.jdbc.net.DB2Driver" # .. likely to work with others... # -# In your Quartz properties file, you'll need to set +# In your Quartz properties file, you'll need to set # org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate # # If you're using DB2 6.x you'll want to set this property to # org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v6Delegate # -# Note that the blob column size (e.g. blob(2000)) dictates the amount of data that can be stored in -# that blob - i.e. limits the amount of data you can put into your JobDataMap +# Note that the blob column size (e.g. blob(2000)) dictates theount of data that can be stored in +# that blob - i.e. limits theount of data you can put into your JobDataMap # @@ -72,7 +72,7 @@ create table qrtz_cron_triggers( ) CREATE TABLE qrtz_simprop_triggers - ( + ( sched_name varchar(120) not null, TRIGGER_NAME VARCHAR(200) NOT NULL, TRIGGER_GROUP VARCHAR(200) NOT NULL, @@ -88,7 +88,7 @@ CREATE TABLE qrtz_simprop_triggers BOOL_PROP_1 VARCHAR(1) NULL, BOOL_PROP_2 VARCHAR(1) NULL, PRIMARY KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(sched_name,TRIGGER_NAME,TRIGGER_GROUP) ) @@ -128,7 +128,7 @@ create table qrtz_fired_triggers( create table qrtz_paused_trigger_grps( sched_name varchar(120) not null, - trigger_group varchar(80) not null, + trigger_group varchar(80) not null, primary key (sched_name,trigger_group) ); @@ -143,6 +143,6 @@ create table qrtz_scheduler_state ( create table qrtz_locks ( sched_name varchar(120) not null, - lock_name varchar(40) not null, + lock_name varchar(40) not null, primary key (sched_name,lock_name) ); diff --git a/demo-task-quartz/init/dbTables/tables_db2_v72.sql b/demo-task-quartz/init/dbTables/tables_db2_v72.sql index 2be28e08a..91e6d4012 100644 --- a/demo-task-quartz/init/dbTables/tables_db2_v72.sql +++ b/demo-task-quartz/init/dbTables/tables_db2_v72.sql @@ -1,10 +1,10 @@ -- --- Thanks to Horia Muntean for submitting this, Mikkel Heisterberg for updating it +-- Thanks to Horia Muntean for submitting this, Mikkel Heisterberg for updating it -- -- .. known to work with DB2 7.2 and the JDBC driver "COM.ibm.db2.jdbc.net.DB2Driver" -- .. likely to work with others... -- --- In your Quartz properties file, you'll need to set +-- In your Quartz properties file, you'll need to set -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v7Delegate -- -- or @@ -14,8 +14,8 @@ -- If you're using DB2 6.x you'll want to set this property to -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v6Delegate -- --- Note that the blob column size (e.g. blob(2000)) dictates the amount of data that can be stored in --- that blob - i.e. limits the amount of data you can put into your JobDataMap +-- Note that the blob column size (e.g. blob(2000)) dictates theount of data that can be stored in +-- that blob - i.e. limits theount of data you can put into your JobDataMap -- DROP TABLE QRTZ_FIRED_TRIGGERS; @@ -87,7 +87,7 @@ create table qrtz_cron_triggers( ); CREATE TABLE qrtz_simprop_triggers - ( + ( sched_name varchar(120) not null, TRIGGER_NAME VARCHAR(200) NOT NULL, TRIGGER_GROUP VARCHAR(200) NOT NULL, @@ -103,7 +103,7 @@ CREATE TABLE qrtz_simprop_triggers BOOL_PROP_1 VARCHAR(1) NULL, BOOL_PROP_2 VARCHAR(1) NULL, PRIMARY KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(sched_name,TRIGGER_NAME,TRIGGER_GROUP) ); @@ -143,7 +143,7 @@ create table qrtz_fired_triggers( create table qrtz_paused_trigger_grps( sched_name varchar(120) not null, - trigger_group varchar(80) not null, + trigger_group varchar(80) not null, primary key (sched_name,trigger_group) ); @@ -158,6 +158,6 @@ create table qrtz_scheduler_state ( create table qrtz_locks ( sched_name varchar(120) not null, - lock_name varchar(40) not null, + lock_name varchar(40) not null, primary key (sched_name,lock_name) ); diff --git a/demo-task-quartz/init/dbTables/tables_h2.sql b/demo-task-quartz/init/dbTables/tables_h2.sql index cc23d3c95..8e14289c5 100644 --- a/demo-task-quartz/init/dbTables/tables_h2.sql +++ b/demo-task-quartz/init/dbTables/tables_h2.sql @@ -1,11 +1,11 @@ --- Thanks to Amir Kibbar and Peter Rietzler for contributing the schema for H2 database, +-- Thanks toir Kibbar and Peter Rietzler for contributing the schema for H2 database, -- and verifying that it works with Quartz's StdJDBCDelegate -- --- Note, Quartz depends on row-level locking which means you must use the MVCC=TRUE +-- Note, Quartz depends on row-level locking which means you must use the MVCC=TRUE -- setting on your H2 database, or you will experience dead-locks -- -- --- In your Quartz properties file, you'll need to set +-- In your Quartz properties file, you'll need to set -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate CREATE TABLE QRTZ_CALENDARS ( @@ -19,7 +19,7 @@ CREATE TABLE QRTZ_CRON_TRIGGERS ( TRIGGER_NAME VARCHAR (200) NOT NULL , TRIGGER_GROUP VARCHAR (200) NOT NULL , CRON_EXPRESSION VARCHAR (120) NOT NULL , - TIME_ZONE_ID VARCHAR (80) + TIME_ZONE_ID VARCHAR (80) ); CREATE TABLE QRTZ_FIRED_TRIGGERS ( @@ -35,12 +35,12 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS ( JOB_NAME VARCHAR (200) NULL , JOB_GROUP VARCHAR (200) NULL , IS_NONCONCURRENT BOOLEAN NULL , - REQUESTS_RECOVERY BOOLEAN NULL + REQUESTS_RECOVERY BOOLEAN NULL ); CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS ( SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_GROUP VARCHAR (200) NOT NULL + TRIGGER_GROUP VARCHAR (200) NOT NULL ); CREATE TABLE QRTZ_SCHEDULER_STATE ( @@ -52,7 +52,7 @@ CREATE TABLE QRTZ_SCHEDULER_STATE ( CREATE TABLE QRTZ_LOCKS ( SCHED_NAME VARCHAR(120) NOT NULL, - LOCK_NAME VARCHAR (40) NOT NULL + LOCK_NAME VARCHAR (40) NOT NULL ); CREATE TABLE QRTZ_JOB_DETAILS ( @@ -78,7 +78,7 @@ CREATE TABLE QRTZ_SIMPLE_TRIGGERS ( ); CREATE TABLE qrtz_simprop_triggers - ( + ( SCHED_NAME VARCHAR(120) NOT NULL, TRIGGER_NAME VARCHAR(200) NOT NULL, TRIGGER_GROUP VARCHAR(200) NOT NULL, @@ -122,14 +122,14 @@ CREATE TABLE QRTZ_TRIGGERS ( ); ALTER TABLE QRTZ_CALENDARS ADD - CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY + CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY ( SCHED_NAME, CALENDAR_NAME ); ALTER TABLE QRTZ_CRON_TRIGGERS ADD - CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY + CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY ( SCHED_NAME, TRIGGER_NAME, @@ -137,35 +137,35 @@ ALTER TABLE QRTZ_CRON_TRIGGERS ADD ); ALTER TABLE QRTZ_FIRED_TRIGGERS ADD - CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY + CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY ( SCHED_NAME, ENTRY_ID ); ALTER TABLE QRTZ_PAUSED_TRIGGER_GRPS ADD - CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY + CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY ( SCHED_NAME, TRIGGER_GROUP ); ALTER TABLE QRTZ_SCHEDULER_STATE ADD - CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY + CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY ( SCHED_NAME, INSTANCE_NAME ); ALTER TABLE QRTZ_LOCKS ADD - CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY + CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY ( SCHED_NAME, LOCK_NAME ); ALTER TABLE QRTZ_JOB_DETAILS ADD - CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY + CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY ( SCHED_NAME, JOB_NAME, @@ -173,7 +173,7 @@ ALTER TABLE QRTZ_JOB_DETAILS ADD ); ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD - CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY + CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY ( SCHED_NAME, TRIGGER_NAME, @@ -181,7 +181,7 @@ ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD ); ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD - CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY + CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY ( SCHED_NAME, TRIGGER_NAME, @@ -189,7 +189,7 @@ ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD ); ALTER TABLE QRTZ_TRIGGERS ADD - CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY + CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY ( SCHED_NAME, TRIGGER_NAME, @@ -245,5 +245,5 @@ ALTER TABLE QRTZ_TRIGGERS ADD JOB_NAME, JOB_GROUP ); - + COMMIT; diff --git a/demo-task-quartz/init/dbTables/tables_pointbase.sql b/demo-task-quartz/init/dbTables/tables_pointbase.sql index debc93f16..b4a992915 100644 --- a/demo-task-quartz/init/dbTables/tables_pointbase.sql +++ b/demo-task-quartz/init/dbTables/tables_pointbase.sql @@ -3,8 +3,8 @@ # # # ...you may want to change defined the size of the "blob" columns before -# creating the tables (particularly for the qrtz_job_details.job_data column), -# if you will be storing large amounts of data in them +# creating the tables (particularly for the qrtz_job_details.job_data column), +# if you will be storing largeounts of data in them # # delete from qrtz_fired_triggers; @@ -30,7 +30,7 @@ drop table qrtz_job_details; drop table qrtz_paused_trigger_grps; drop table qrtz_locks; drop table qrtz_scheduler_state; - + CREATE TABLE qrtz_job_details ( @@ -38,7 +38,7 @@ CREATE TABLE qrtz_job_details JOB_NAME VARCHAR2(80) NOT NULL, JOB_GROUP VARCHAR2(80) NOT NULL, DESCRIPTION VARCHAR2(120) NULL, - JOB_CLASS_NAME VARCHAR2(128) NOT NULL, + JOB_CLASS_NAME VARCHAR2(128) NOT NULL, IS_DURABLE BOOLEAN NOT NULL, IS_NONCONCURRENT BOOLEAN NOT NULL, IS_UPDATE_DATA BOOLEAN NOT NULL, @@ -52,7 +52,7 @@ CREATE TABLE qrtz_triggers SCHED_NAME VARCHAR(120) NOT NULL, TRIGGER_NAME VARCHAR2(80) NOT NULL, TRIGGER_GROUP VARCHAR2(80) NOT NULL, - JOB_NAME VARCHAR2(80) NOT NULL, + JOB_NAME VARCHAR2(80) NOT NULL, JOB_GROUP VARCHAR2(80) NOT NULL, DESCRIPTION VARCHAR2(120) NULL, NEXT_FIRE_TIME NUMBER(13) NULL, @@ -66,8 +66,8 @@ CREATE TABLE qrtz_triggers MISFIRE_INSTR NUMBER(2) NULL, JOB_DATA BLOB(4K) NULL, PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) - REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) + FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP) + REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP) ); CREATE TABLE qrtz_simple_triggers @@ -79,13 +79,13 @@ CREATE TABLE qrtz_simple_triggers REPEAT_INTERVAL NUMBER(12) NOT NULL, TIMES_TRIGGERED NUMBER(10) NOT NULL, PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) ); CREATE TABLE qrtz_simprop_triggers - ( + ( SCHED_NAME VARCHAR(120) NOT NULL, TRIGGER_NAME VARCHAR(200) NOT NULL, TRIGGER_GROUP VARCHAR(200) NOT NULL, @@ -101,7 +101,7 @@ CREATE TABLE qrtz_simprop_triggers BOOL_PROP_1 BOOLEAN NULL, BOOL_PROP_2 BOOLEAN NULL, PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) ); @@ -113,7 +113,7 @@ CREATE TABLE qrtz_cron_triggers CRON_EXPRESSION VARCHAR2(120) NOT NULL, TIME_ZONE_ID VARCHAR2(80), PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) ); @@ -124,14 +124,14 @@ CREATE TABLE qrtz_blob_triggers TRIGGER_GROUP VARCHAR2(80) NOT NULL, BLOB_DATA BLOB(4K) NULL, PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP), - FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) + FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) ); CREATE TABLE qrtz_calendars ( SCHED_NAME VARCHAR(120) NOT NULL, - CALENDAR_NAME VARCHAR2(80) NOT NULL, + CALENDAR_NAME VARCHAR2(80) NOT NULL, CALENDAR BLOB(4K) NOT NULL, PRIMARY KEY (SCHED_NAME,CALENDAR_NAME) ); @@ -139,11 +139,11 @@ CREATE TABLE qrtz_calendars CREATE TABLE qrtz_paused_trigger_grps ( SCHED_NAME VARCHAR(120) NOT NULL, - TRIGGER_GROUP VARCHAR2(80) NOT NULL, + TRIGGER_GROUP VARCHAR2(80) NOT NULL, PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP) ); -CREATE TABLE qrtz_fired_triggers +CREATE TABLE qrtz_fired_triggers ( SCHED_NAME VARCHAR(120) NOT NULL, ENTRY_ID VARCHAR2(95) NOT NULL, @@ -161,7 +161,7 @@ CREATE TABLE qrtz_fired_triggers PRIMARY KEY (SCHED_NAME,ENTRY_ID) ); -CREATE TABLE qrtz_scheduler_state +CREATE TABLE qrtz_scheduler_state ( SCHED_NAME VARCHAR(120) NOT NULL, INSTANCE_NAME VARCHAR2(80) NOT NULL, @@ -173,7 +173,7 @@ CREATE TABLE qrtz_scheduler_state CREATE TABLE qrtz_locks ( SCHED_NAME VARCHAR(120) NOT NULL, - LOCK_NAME VARCHAR2(40) NOT NULL, + LOCK_NAME VARCHAR2(40) NOT NULL, PRIMARY KEY (SCHED_NAME,LOCK_NAME) ); diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java index ba40b18ba..8861ef383 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.task.quartz - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/23 20:33 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-23 20:33 */ @MapperScan(basePackages = {"com.xkcoding.task.quartz.mapper"}) @SpringBootApplication diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java index 81dad5edf..7d2798862 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java @@ -10,13 +10,8 @@ * 通用Api封装 *

* - * @package: com.xkcoding.task.quartz.common - * @description: 通用Api封装 - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:59 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:59 */ @Data public class ApiResponse implements Serializable { diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java index 2e167ec06..c1d9ebf25 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java @@ -22,13 +22,8 @@ * Job Controller *

* - * @package: com.xkcoding.task.quartz.controller - * @description: Job Controller - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:23 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:23 */ @RestController @RequestMapping("/job") diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java index 5a05b9260..c94bce1b5 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java @@ -9,13 +9,8 @@ * 实体类 *

* - * @package: com.xkcoding.task.quartz.entity.domain - * @description: 实体类 - * @author: yangkai.shen - * @date: Created in 2018-11-26 15:05 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 15:05 */ @Data public class JobAndTrigger { @@ -59,4 +54,4 @@ public class JobAndTrigger { * 定时任务状态 */ private String triggerState; -} \ No newline at end of file +} diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java index d57108366..c91781f8d 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java @@ -10,13 +10,8 @@ * 定时任务详情 *

* - * @package: com.xkcoding.task.quartz.entity.form - * @description: 定时任务详情 - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:42 */ @Data @Accessors(chain = true) diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java index f56899c41..b1579ffa2 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java @@ -10,13 +10,8 @@ * Hello Job *

* - * @package: com.xkcoding.task.quartz.job - * @description: Hello Job - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:22 */ @Slf4j public class HelloJob implements BaseJob { @@ -25,4 +20,4 @@ public class HelloJob implements BaseJob { public void execute(JobExecutionContext context) { log.error("Hello Job 执行时间: {}", DateUtil.now()); } -} \ No newline at end of file +} diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java index a42d1849c..ec41d1e99 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java @@ -10,13 +10,8 @@ * Test Job *

* - * @package: com.xkcoding.task.quartz.job - * @description: Test Job - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:22 */ @Slf4j public class TestJob implements BaseJob { @@ -25,4 +20,4 @@ public class TestJob implements BaseJob { public void execute(JobExecutionContext context) { log.error("Test Job 执行时间: {}", DateUtil.now()); } -} \ No newline at end of file +} diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java index cc5156f6a..d0343f7f9 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java @@ -7,13 +7,8 @@ * Job 基类,主要是在 {@link org.quartz.Job} 上再封装一层,只让我们自己项目里的Job去实现 *

* - * @package: com.xkcoding.task.quartz.job.base - * @description: Job 基类,主要是在 {@link org.quartz.Job} 上再封装一层,只让我们自己项目里的Job去实现 - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:27 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:27 */ public interface BaseJob extends Job { /** diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java index f59885b6b..cd4d28b7c 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java @@ -10,13 +10,8 @@ * Job Mapper *

* - * @package: com.xkcoding.task.quartz.mapper - * @description: Job Mapper - * @author: yangkai.shen - * @date: Created in 2018-11-26 15:12 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 15:12 */ @Component public interface JobMapper { diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java index d8cb57b43..33f518465 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java @@ -3,7 +3,6 @@ import com.github.pagehelper.PageInfo; import com.xkcoding.task.quartz.entity.domain.JobAndTrigger; import com.xkcoding.task.quartz.entity.form.JobForm; -import org.quartz.JobDetail; import org.quartz.SchedulerException; /** @@ -11,13 +10,8 @@ * Job Service *

* - * @package: com.xkcoding.task.quartz.service - * @description: Job Service - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:24 */ public interface JobService { /** diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java index 63eb61fc7..9cb88d6ea 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java @@ -19,13 +19,8 @@ * Job Service *

* - * @package: com.xkcoding.task.quartz.service.impl - * @description: Job Service - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:25 */ @Service @Slf4j diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java index 49c0603f1..ab98b10b5 100644 --- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java +++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java @@ -7,13 +7,8 @@ * 定时任务反射工具类 *

* - * @package: com.xkcoding.task.quartz.util - * @description: 定时任务反射工具类 - * @author: yangkai.shen - * @date: Created in 2018-11-26 13:33 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-26 13:33 */ public class JobUtil { /** diff --git a/demo-task/README.md b/demo-task/README.md index 280c8d0fd..c56646e0c 100644 --- a/demo-task/README.md +++ b/demo-task/README.md @@ -86,13 +86,8 @@ * 定时任务配置,配置线程池,使用不同线程执行任务,提升效率 *

* - * @package: com.xkcoding.task.config - * @description: 定时任务配置,配置线程池,使用不同线程执行任务,提升效率 - * @author: yangkai.shen - * @date: Created in 2018/11/22 19:02 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-22 19:02 */ @Configuration @EnableScheduling @@ -124,13 +119,8 @@ public class TaskConfig implements SchedulingConfigurer { * 定时任务 *

* - * @package: com.xkcoding.task.job - * @description: 定时任务 - * @author: yangkai.shen - * @date: Created in 2018/11/22 19:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-22 19:09 */ @Component @Slf4j @@ -182,4 +172,4 @@ server: ## 参考 -- Spring Boot官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling \ No newline at end of file +- Spring Boot官方文档:https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling diff --git a/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java b/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java index 55687ad8a..8f75a0052 100644 --- a/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java +++ b/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.task - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018/11/22 19:00 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-22 19:00 */ @SpringBootApplication public class SpringBootDemoTaskApplication { diff --git a/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java b/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java index 43ec481e6..9a00e9e45 100644 --- a/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java +++ b/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java @@ -16,13 +16,8 @@ * 定时任务配置,配置线程池,使用不同线程执行任务,提升效率 *

* - * @package: com.xkcoding.task.config - * @description: 定时任务配置,配置线程池,使用不同线程执行任务,提升效率 - * @author: yangkai.shen - * @date: Created in 2018/11/22 19:02 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-22 19:02 */ @Configuration @EnableScheduling diff --git a/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java b/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java index dfbc91282..94965e18f 100644 --- a/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java +++ b/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java @@ -12,13 +12,8 @@ * 定时任务 *

* - * @package: com.xkcoding.task.job - * @description: 定时任务 - * @author: yangkai.shen - * @date: Created in 2018/11/22 19:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-22 19:09 */ @Component @Slf4j @@ -49,4 +44,4 @@ public void job2() { public void job3() { log.info("【job3】开始执行:{}", DateUtil.formatDateTime(new Date())); } -} \ No newline at end of file +} diff --git a/demo-template-beetl/README.md b/demo-template-beetl/README.md index f68e92f51..fffc08e30 100644 --- a/demo-template-beetl/README.md +++ b/demo-template-beetl/README.md @@ -81,13 +81,8 @@ * 主页 *

* - * @package: com.xkcoding.template.beetl.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:17 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:17 */ @Controller @Slf4j @@ -118,13 +113,8 @@ public class IndexController { * 用户页面 *

* - * @package: com.xkcoding.template.beetl.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:17 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:17 */ @Controller @RequestMapping("/user") diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java index ccd59fc57..f7fc8cbc6 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.template.beetl - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:17 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:17 */ @SpringBootApplication public class SpringBootDemoTemplateBeetlApplication { diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java index 6c05f413a..4f6f00023 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java @@ -14,13 +14,8 @@ * 主页 *

* - * @package: com.xkcoding.template.beetl.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:17 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:17 */ @Controller @Slf4j diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java index 8bafff5a6..272676b11 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java @@ -15,13 +15,8 @@ * 用户页面 *

* - * @package: com.xkcoding.template.beetl.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:17 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:17 */ @Controller @RequestMapping("/user") diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java index 00854b935..fc706edbd 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java @@ -7,13 +7,8 @@ * 用户 model *

* - * @package: com.xkcoding.template.beetl.model - * @description: 用户 model - * @author: yangkai.shen - * @date: Created in 2018/10/10 11:18 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 11:18 */ @Data public class User { diff --git a/demo-template-enjoy/README.md b/demo-template-enjoy/README.md index 4994129ca..2d169299d 100644 --- a/demo-template-enjoy/README.md +++ b/demo-template-enjoy/README.md @@ -81,13 +81,8 @@ * Enjoy 模板配置类 *

* - * @package: com.xkcoding.template.enjoy.config - * @description: Enjoy 模板配置类 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:06 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:06 */ @Configuration public class EnjoyConfig { @@ -119,13 +114,8 @@ public class EnjoyConfig { * 主页 *

* - * @package: com.xkcoding.template.enjoy.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:22 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:22 */ @Controller @Slf4j @@ -156,13 +146,8 @@ public class IndexController { * 用户页面 *

* - * @package: com.xkcoding.template.enjoy.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:24 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:24 */ @Controller @RequestMapping("/user") diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java index 46314b9ad..a1db5d4fd 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.template.enjoy - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:06 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:06 */ @SpringBootApplication public class SpringBootDemoTemplateEnjoyApplication { diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java index 246a55728..817cf3cb2 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java @@ -10,13 +10,8 @@ * Enjoy 模板配置类 *

* - * @package: com.xkcoding.template.enjoy.config - * @description: Enjoy 模板配置类 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:06 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:06 */ @Configuration public class EnjoyConfig { diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java index 6cc978de5..46b9380f5 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java @@ -14,13 +14,8 @@ * 主页 *

* - * @package: com.xkcoding.template.enjoy.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:22 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:22 */ @Controller @Slf4j diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java index 41bddff3d..e6afad947 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java @@ -15,13 +15,8 @@ * 用户页面 *

* - * @package: com.xkcoding.template.enjoy.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:24 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:24 */ @Controller @RequestMapping("/user") diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java index 99a7bcefc..af7c81359 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java @@ -7,13 +7,8 @@ * 用户 model *

* - * @package: com.xkcoding.template.enjoy.model - * @description: 用户 model - * @author: yangkai.shen - * @date: Created in 2018/10/11 2:21 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-11 14:21 */ @Data public class User { diff --git a/demo-template-freemarker/README.md b/demo-template-freemarker/README.md index 825ab5457..bd22e2bdd 100644 --- a/demo-template-freemarker/README.md +++ b/demo-template-freemarker/README.md @@ -79,13 +79,8 @@ * 主页 *

* - * @package: com.xkcoding.template.freemarker.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:07 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-019 15:07 */ @Controller @Slf4j @@ -116,13 +111,8 @@ public class IndexController { * 用户页面 *

* - * @package: com.xkcoding.template.freemarker.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:11 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-019 15:11 */ @Controller @RequestMapping("/user") diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java index bd01c29fc..735fce700 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.template.freemarker - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:17 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-19 15:17 */ @SpringBootApplication public class SpringBootDemoTemplateFreemarkerApplication { diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java index d06aa4e8f..47425353d 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java @@ -14,13 +14,8 @@ * 主页 *

* - * @package: com.xkcoding.template.freemarker.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:07 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-19 15:07 */ @Controller @Slf4j diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java index 0631e06f8..93b2fe7cc 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java @@ -15,13 +15,8 @@ * 用户页面 *

* - * @package: com.xkcoding.template.freemarker.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:11 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-19 15:11 */ @Controller @RequestMapping("/user") diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java index d03e4204d..ac1e016e6 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java @@ -7,13 +7,8 @@ * 用户 model *

* - * @package: com.xkcoding.template.freemarker.model - * @description: 用户 model - * @author: yangkai.shen - * @date: Created in 2018/10/9 3:06 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-19 15:06 */ @Data public class User { diff --git a/demo-template-thymeleaf/README.md b/demo-template-thymeleaf/README.md index 10569a35e..e588d1e03 100644 --- a/demo-template-thymeleaf/README.md +++ b/demo-template-thymeleaf/README.md @@ -79,13 +79,8 @@ * 主页 *

* - * @package: com.xkcoding.template.thymeleaf.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:12 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:12 */ @Controller @Slf4j @@ -116,13 +111,8 @@ public class IndexController { * 用户页面 *

* - * @package: com.xkcoding.template.thymeleaf.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:11 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:11 */ @Controller @RequestMapping("/user") diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java index 0bb1b921f..b4c482f61 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.template.thymeleaf - * @description: 启动类 - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:10 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:10 */ @SpringBootApplication public class SpringBootDemoTemplateThymeleafApplication { diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java index 228554ac2..dced597a8 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java @@ -14,13 +14,8 @@ * 主页 *

* - * @package: com.xkcoding.template.thymeleaf.controller - * @description: 主页 - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:12 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:12 */ @Controller @Slf4j diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java index 2b574597f..aefb8e8a5 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java @@ -15,13 +15,8 @@ * 用户页面 *

* - * @package: com.xkcoding.template.thymeleaf.controller - * @description: 用户页面 - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:11 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:11 */ @Controller @RequestMapping("/user") diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java index 01592d4f2..4729104ae 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java @@ -7,13 +7,8 @@ * 用户 model *

* - * @package: com.xkcoding.template.thymeleaf.model - * @description: 用户 model - * @author: yangkai.shen - * @date: Created in 2018/10/10 10:11 AM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-10 10:11 */ @Data public class User { diff --git a/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java b/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java index 3d8746a3e..58228650e 100644 --- a/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java +++ b/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.springbootdemotio - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-02-05 18:58 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-02-05 18:58 */ @SpringBootApplication public class SpringBootDemoTioApplication { diff --git a/demo-upload/README.md b/demo-upload/README.md index a13937448..22d01df6e 100644 --- a/demo-upload/README.md +++ b/demo-upload/README.md @@ -85,13 +85,8 @@ * 上传配置 *

* - * @package: com.xkcoding.upload.config - * @description: 上传配置 - * @author: yangkai.shen - * @date: Created in 2018/10/23 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-23 14:09 */ @Configuration @ConditionalOnClass({Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class}) @@ -173,13 +168,8 @@ public class UploadConfig { * 文件上传 Controller *

* - * @package: com.xkcoding.upload.controller - * @description: 文件上传 Controller - * @author: yangkai.shen - * @date: Created in 2018/11/6 16:33 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-06 16:33 */ @RestController @Slf4j @@ -261,13 +251,8 @@ public class UploadController { * 七牛云上传Service *

* - * @package: com.xkcoding.upload.service.impl - * @description: 七牛云上传Service - * @author: yangkai.shen - * @date: Created in 2018/11/6 17:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-06 17:22 */ @Service @Slf4j diff --git a/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java b/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java index 2afb7afeb..ff9fba863 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java @@ -8,13 +8,8 @@ * 启动类 *

* - * @package: com.xkcoding.upload - * @description: 启动类 - * @author: shenyangkai - * @date: Created in 2018/10/20 21:23 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: shenyangkai + * @author yangkai.shen + * @date Created in 2018-10-20 21:23 */ @SpringBootApplication public class SpringBootDemoUploadApplication { diff --git a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java index c367ca861..d8b4a5187 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java @@ -25,13 +25,8 @@ * 上传配置 *

* - * @package: com.xkcoding.upload.config - * @description: 上传配置 - * @author: yangkai.shen - * @date: Created in 2018/10/23 14:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-23 14:09 */ @Configuration @ConditionalOnClass({Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class}) diff --git a/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java index 003ffc204..c1fbe33f5 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java @@ -8,13 +8,8 @@ * 首页Controller *

* - * @package: com.xkcoding.upload.controller - * @description: 首页Controller - * @author: shenyangkai - * @date: Created in 2018/10/20 21:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: shenyangkai + * @author yangkai.shen + * @date Created in 2018-10-20 21:22 */ @Controller public class IndexController { diff --git a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java index e31dd4203..bb0abb9ec 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java @@ -26,13 +26,8 @@ * 文件上传 Controller *

* - * @package: com.xkcoding.upload.controller - * @description: 文件上传 Controller - * @author: yangkai.shen - * @date: Created in 2018/11/6 16:33 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-06 16:33 */ @RestController @Slf4j diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java index 15a15be52..0a956b39d 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java @@ -10,13 +10,8 @@ * 七牛云上传Service *

* - * @package: com.xkcoding.upload.service - * @description: 七牛云上传Service - * @author: yangkai.shen - * @date: Created in 2018/11/6 17:21 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-06 17:21 */ public interface IQiNiuService { /** diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java index 8993e643d..470b0d5fd 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java @@ -19,13 +19,8 @@ * 七牛云上传Service *

* - * @package: com.xkcoding.upload.service.impl - * @description: 七牛云上传Service - * @author: yangkai.shen - * @date: Created in 2018/11/6 17:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-11-06 17:22 */ @Service @Slf4j diff --git a/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java b/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java index 369d64c20..f16fd407c 100644 --- a/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java +++ b/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.ureport2 - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-02-26 23:56 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-02-26 23:56 */ @SpringBootApplication public class SpringBootDemoUreport2Application { diff --git a/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java b/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java index d9d0dbb8a..3ff9b9f9a 100644 --- a/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java +++ b/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.urule - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2019-02-25 22:46 - * @copyright: Copyright (c) 2019 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2019-02-25 22:46 */ @SpringBootApplication public class SpringBootDemoUruleApplication { diff --git a/demo-war/README.md b/demo-war/README.md index 978ceebcd..6f1f18254 100644 --- a/demo-war/README.md +++ b/demo-war/README.md @@ -71,13 +71,8 @@ * 启动器 *

* - * @package: com.xkcoding.war - * @description: 启动器 - * @author: shenyangkai - * @date: Created in 2018/10/30 19:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: shenyangkai + * @author yangkai.shen + * @date Created in 2018-10-30 19:37 */ @SpringBootApplication public class SpringBootDemoWarApplication extends SpringBootServletInitializer { @@ -87,7 +82,7 @@ public class SpringBootDemoWarApplication extends SpringBootServletInitializer { } /** - * 若需要打成 war 包,则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)} + * 若需要打成 war 包,则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)} */ @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { diff --git a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java b/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java index 2ef1d1b49..f1da4cdf3 100644 --- a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java +++ b/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java @@ -10,13 +10,8 @@ * 启动器 *

* - * @package: com.xkcoding.war - * @description: 启动器 - * @author: shenyangkai - * @date: Created in 2018/10/30 19:37 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: shenyangkai + * @author yangkai.shen + * @date Created in 2018-10-30 19:37 */ @SpringBootApplication public class SpringBootDemoWarApplication extends SpringBootServletInitializer { diff --git a/demo-websocket-socketio/README.md b/demo-websocket-socketio/README.md index 8eaea88af..60d43cd6f 100644 --- a/demo-websocket-socketio/README.md +++ b/demo-websocket-socketio/README.md @@ -91,13 +91,8 @@ * websocket服务器配置 *

* - * @package: com.xkcoding.websocket.socketio.config - * @description: websocket服务器配置 - * @author: yangkai.shen - * @date: Created in 2018-12-18 16:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 16:42 */ @Configuration @EnableConfigurationProperties({WsConfig.class}) @@ -142,13 +137,8 @@ public class ServerConfig { * 消息事件处理 *

* - * @package: com.xkcoding.websocket.socketio.handler - * @description: 消息事件处理 - * @author: yangkai.shen - * @date: Created in 2018-12-18 18:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 18:57 */ @Component @Slf4j @@ -286,13 +276,8 @@ public class MessageEventHandler { * websocket服务器启动 *

* - * @package: com.xkcoding.websocket.socketio.init - * @description: websocket服务器启动 - * @author: yangkai.shen - * @date: Created in 2018-12-18 17:07 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 17:07 */ @Component @Slf4j @@ -331,4 +316,4 @@ public class ServerRunner implements CommandLineRunner { ### 4.2. 前端 1. socket.io 官网:https://socket.io/ -2. axios.js 用法:https://github.com/axios/axios#example \ No newline at end of file +2. axios.js 用法:https://github.com/axios/axios#example diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java index c604527c4..2d1c7fa86 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.websocket.socketio - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-12 13:59 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-12 13:59 */ @SpringBootApplication public class SpringBootDemoWebsocketSocketioApplication { diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java index 225187a15..8f24558bf 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java @@ -13,13 +13,8 @@ * 模拟数据库 *

* - * @package: com.xkcoding.websocket.socketio.config - * @description: 模拟数据库 - * @author: yangkai.shen - * @date: Created in 2018-12-18 19:12 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 19:12 */ @Component public class DbTemplate { diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java index 75caa7f62..0fb4468e8 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java @@ -5,13 +5,8 @@ * 事件常量 *

* - * @package: com.xkcoding.websocket.socketio.config - * @description: 事件常量 - * @author: yangkai.shen - * @date: Created in 2018-12-18 19:36 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 19:36 */ public interface Event { /** diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java index 8baccc1dd..15985a35c 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java @@ -12,13 +12,8 @@ * websocket服务器配置 *

* - * @package: com.xkcoding.websocket.socketio.config - * @description: websocket服务器配置 - * @author: yangkai.shen - * @date: Created in 2018-12-18 16:42 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 16:42 */ @Configuration @EnableConfigurationProperties({WsConfig.class}) diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java index a94505ca1..1077fae86 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java @@ -8,13 +8,8 @@ * WebSocket配置类 *

* - * @package: com.xkcoding.websocket.socketio.config - * @description: WebSocket配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-18 16:41 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 16:41 */ @ConfigurationProperties(prefix = "ws.server") @Data diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java index ed94ffb26..a64c638c2 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java @@ -19,13 +19,8 @@ * 消息发送Controller *

* - * @package: com.xkcoding.websocket.socketio.controller - * @description: 消息发送Controller - * @author: yangkai.shen - * @date: Created in 2018-12-18 19:50 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 19:50 */ @RestController @RequestMapping("/send") diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java index 3610115b1..d89a6c3b9 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java @@ -27,13 +27,8 @@ * 消息事件处理 *

* - * @package: com.xkcoding.websocket.socketio.handler - * @description: 消息事件处理 - * @author: yangkai.shen - * @date: Created in 2018-12-18 18:57 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 18:57 */ @Component @Slf4j diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java index cb548b56f..23daf6eae 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java @@ -11,13 +11,8 @@ * websocket服务器启动 *

* - * @package: com.xkcoding.websocket.socketio.init - * @description: websocket服务器启动 - * @author: yangkai.shen - * @date: Created in 2018-12-18 17:07 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 17:07 */ @Component @Slf4j diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java index 7fe9bb30f..47de011dc 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java @@ -7,13 +7,8 @@ * 广播消息载荷 *

* - * @package: com.xkcoding.websocket.socketio.payload - * @description: 广播消息载荷 - * @author: yangkai.shen - * @date: Created in 2018-12-18 20:01 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 20:01 */ @Data public class BroadcastMessageRequest { diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java index 5670b41cf..67d7171d7 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java @@ -7,13 +7,8 @@ * 群聊消息载荷 *

* - * @package: com.xkcoding.websocket.socketio.payload - * @description: 群聊消息载荷 - * @author: yangkai.shen - * @date: Created in 2018-12-18 16:59 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 16:59 */ @Data public class GroupMessageRequest { diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java index ef63fc8b6..d20d87390 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java @@ -7,13 +7,8 @@ * 加群载荷 *

* - * @package: com.xkcoding.websocket.socketio.payload - * @description: 加群载荷 - * @author: yangkai.shen - * @date: Created in 2018-12-19 13:36 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-19 13:36 */ @Data public class JoinRequest { diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java index 5998b83e9..fcc2a461f 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java @@ -7,13 +7,8 @@ * 私聊消息载荷 *

* - * @package: com.xkcoding.websocket.socketio.payload - * @description: 私聊消息载荷 - * @author: yangkai.shen - * @date: Created in 2018-12-18 17:02 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-18 17:02 */ @Data public class SingleMessageRequest { diff --git a/demo-websocket/README.md b/demo-websocket/README.md index dc81fcec0..d69aaff1b 100644 --- a/demo-websocket/README.md +++ b/demo-websocket/README.md @@ -92,13 +92,8 @@ * WebSocket配置 *

* - * @package: com.xkcoding.websocket.config - * @description: WebSocket配置 - * @author: yangkai.shen - * @date: Created in 2018-12-14 15:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 15:58 */ @Configuration @EnableWebSocket @@ -135,13 +130,8 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { * 服务器定时推送任务 *

* - * @package: com.xkcoding.websocket.task - * @description: 服务器定时推送任务 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:04 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:04 */ @Slf4j @Component @@ -386,4 +376,4 @@ public class ServerTask { 2. element-ui 用法:http://element-cn.eleme.io/#/zh-CN 3. stomp.js 用法:https://github.com/jmesnil/stomp-websocket 4. sockjs 用法:https://github.com/sockjs/sockjs-client -5. axios.js 用法:https://github.com/axios/axios#example \ No newline at end of file +5. axios.js 用法:https://github.com/axios/axios#example diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java b/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java index 6351666ed..3633fa97e 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java @@ -9,13 +9,8 @@ * 启动器 *

* - * @package: com.xkcoding.websocket - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-14 14:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 14:58 */ @SpringBootApplication @EnableScheduling diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java b/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java index 8b577e207..1d0bec6d2 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java @@ -5,13 +5,8 @@ * WebSocket常量 *

* - * @package: com.xkcoding.websocket.common - * @description: WebSocket常量 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:01 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:01 */ public interface WebSocketConsts { String PUSH_SERVER = "/topic/server"; diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java index 47de6d43d..8c0876659 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java @@ -12,13 +12,8 @@ * WebSocket配置 *

* - * @package: com.xkcoding.websocket.config - * @description: WebSocket配置 - * @author: yangkai.shen - * @date: Created in 2018-12-14 15:58 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 15:58 */ @Configuration @EnableWebSocket diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java b/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java index b4c61e878..3dce171f6 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java @@ -13,13 +13,8 @@ * 服务器监控Controller *

* - * @package: com.xkcoding.websocket.controller - * @description: 服务器监控Controller - * @author: yangkai.shen - * @date: Created in 2018-12-17 10:22 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-17 10:22 */ @RestController @RequestMapping("/server") diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java index 8d51a7338..17fb9a3a6 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java @@ -23,13 +23,8 @@ * 服务器相关信息实体 *

* - * @package: com.xkcoding.websocket.model - * @description: 服务器相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:09 */ public class Server { @@ -217,4 +212,4 @@ public String convertFileSize(long size) { return String.format("%d B", size); } } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java index d84cb1984..b0b59bdb7 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java @@ -7,13 +7,8 @@ * CPU相关信息实体 *

* - * @package: com.xkcoding.websocket.model.server - * @description: CPU相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:09 */ public class Cpu { /** @@ -98,4 +93,4 @@ public double getFree() { public void setFree(double free) { this.free = free; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java index a0b770b74..3dd3dedf2 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java @@ -11,13 +11,8 @@ * JVM相关信息实体 *

* - * @package: com.xkcoding.websocket.model.server - * @description: JVM相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:09 */ public class Jvm { /** @@ -130,4 +125,4 @@ public String getRunTime() { .getStartTime(); return DateUtil.formatBetween(DateUtil.current(false) - startTime); } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java index 0b72bf477..6d09d7940 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java @@ -7,13 +7,8 @@ * 內存相关信息实体 *

* - * @package: com.xkcoding.websocket.model.server - * @description: 內存相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:09 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:09 */ public class Mem { /** @@ -58,4 +53,4 @@ public void setFree(long free) { public double getUsage() { return NumberUtil.mul(NumberUtil.div(used, total, 4), 100); } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java index f2321cbf9..ee037933f 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java @@ -5,13 +5,8 @@ * 系统相关信息实体 *

* - * @package: com.xkcoding.websocket.model.server - * @description: 系统相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:10 */ public class Sys { /** @@ -78,4 +73,4 @@ public String getOsArch() { public void setOsArch(String osArch) { this.osArch = osArch; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java index 823cf756f..00c63f7e0 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java @@ -5,13 +5,8 @@ * 系统文件相关信息实体 *

* - * @package: com.xkcoding.websocket.model.server - * @description: 系统文件相关信息实体 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:10 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:10 */ public class SysFile { /** @@ -104,4 +99,4 @@ public double getUsage() { public void setUsage(double usage) { this.usage = usage; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java index 2db70864d..469d24a14 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java @@ -9,13 +9,8 @@ * 键值匹配 *

* - * @package: com.xkcoding.websocket.payload - * @description: 键值匹配 - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:41 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:41 */ @Data @AllArgsConstructor diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java index d36b38a66..4d97cd07d 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java @@ -12,13 +12,8 @@ * 服务器信息VO *

* - * @package: com.xkcoding.websocket.payload - * @description: 服务器信息VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:25 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:25 */ @Data public class ServerVO { diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java index e9524c960..73b7bd123 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java @@ -12,13 +12,8 @@ * CPU相关信息实体VO *

* - * @package: com.xkcoding.websocket.payload.server - * @description: CPU相关信息实体VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:27 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:27 */ @Data public class CpuVO { @@ -34,4 +29,4 @@ public static CpuVO create(Cpu cpu) { vo.data.add(new KV("CPU当前空闲率", cpu.getFree() + "%")); return vo; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java index 78b6749b1..77285ae98 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java @@ -12,13 +12,8 @@ * JVM相关信息实体VO *

* - * @package: com.xkcoding.websocket.payload.server - * @description: JVM相关信息实体VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:28 */ @Data public class JvmVO { @@ -37,4 +32,4 @@ public static JvmVO create(Jvm jvm) { return vo; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java index fa24fce99..7ab709fb8 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java @@ -12,13 +12,8 @@ * 內存相关信息实体VO *

* - * @package: com.xkcoding.websocket.payload.server - * @description: 內存相关信息实体VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:28 */ @Data public class MemVO { @@ -32,4 +27,4 @@ public static MemVO create(Mem mem) { vo.data.add(new KV("使用率", mem.getUsage() + "%")); return vo; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java index c4e5e46a4..c4b767e9b 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java @@ -12,13 +12,8 @@ * 系统文件相关信息实体VO *

* - * @package: com.xkcoding.websocket.payload.server - * @description: 系统文件相关信息实体VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:30 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:30 */ @Data public class SysFileVO { @@ -41,4 +36,4 @@ public static SysFileVO create(List sysFiles) { } return vo; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java index 6b722dbf9..a3a00296c 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java @@ -12,13 +12,8 @@ * 系统相关信息实体VO *

* - * @package: com.xkcoding.websocket.payload.server - * @description: 系统相关信息实体VO - * @author: yangkai.shen - * @date: Created in 2018-12-14 17:28 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 17:28 */ @Data public class SysVO { @@ -33,4 +28,4 @@ public static SysVO create(Sys sys) { vo.data.add(new KV("系统架构", sys.getOsArch())); return vo; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java b/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java index 62d24e90b..808816167 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java @@ -20,13 +20,8 @@ * 服务器定时推送任务 *

* - * @package: com.xkcoding.websocket.task - * @description: 服务器定时推送任务 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:04 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:04 */ @Slf4j @Component diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java index 68ac0c5c3..647d57069 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java @@ -9,13 +9,8 @@ * IP 工具类 *

* - * @package: com.xkcoding.websocket.util - * @description: IP 工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-14 16:08 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-14 16:08 */ public class IpUtil { public static String getIpAddr(HttpServletRequest request) { @@ -166,4 +161,4 @@ public static String getHostName() { } return "未知"; } -} \ No newline at end of file +} diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java index 4256f1813..4f940faed 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java @@ -9,13 +9,8 @@ * 服务器转换工具类 *

* - * @package: com.xkcoding.websocket.util - * @description: 服务器转换工具类 - * @author: yangkai.shen - * @date: Created in 2018-12-17 10:24 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-17 10:24 */ public class ServerUtil { /** diff --git a/demo-zookeeper/README.md b/demo-zookeeper/README.md index 8b12cf1eb..15d10b9dd 100644 --- a/demo-zookeeper/README.md +++ b/demo-zookeeper/README.md @@ -93,13 +93,8 @@ * Zookeeper 配置项 *

* - * @package: com.xkcoding.zookeeper.config.props - * @description: Zookeeper 配置项 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:47 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:47 */ @Data @ConfigurationProperties(prefix = "zk") @@ -143,13 +138,8 @@ zk: * Zookeeper配置类 *

* - * @package: com.xkcoding.zookeeper.config - * @description: Zookeeper配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:45 */ @Configuration @EnableConfigurationProperties(ZkProps.class) @@ -182,13 +172,8 @@ public class ZkConfig { * 在需要加锁的方法上打上该注解后,AOP会帮助你统一管理这个方法的锁 *

* - * @package: com.xkcoding.zookeeper.annotation - * @description: 基于Zookeeper的分布式锁注解,在需要加锁的方法上打上该注解后,AOP会帮助你统一管理这个方法的锁 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:11 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:11 */ @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @@ -222,13 +207,8 @@ public @interface ZooLock { * 分布式锁动态key注解,配置之后key的值会动态获取参数内容 *

* - * @package: com.xkcoding.zookeeper.annotation - * @description: 分布式锁动态key注解,配置之后key的值会动态获取参数内容 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:17 */ @Target({ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @@ -255,13 +235,8 @@ public @interface LockKeyParam { * 使用 aop 切面记录请求日志信息 *

* - * @package: com.xkcoding.log.aop.aspectj - * @description: 使用 aop 切面记录请求日志信息 - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:05 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:05 */ @Aspect @Component @@ -458,4 +433,4 @@ public class SpringBootDemoZookeeperApplicationTests { ## 参考 1. [如何在测试类中使用 AOP](https://stackoverflow.com/questions/11436600/unit-testing-spring-around-aop-methods) -2. zookeeper 实现分布式锁:《Spring Boot 2精髓 从构建小系统到架构分布式大系统》李家智 - 第16章 - Spring Boot 和 Zoo Keeper - 16.3 实现分布式锁 \ No newline at end of file +2. zookeeper 实现分布式锁:《Spring Boot 2精髓 从构建小系统到架构分布式大系统》李家智 - 第16章 - Spring Boot 和 Zoo Keeper - 16.3 实现分布式锁 diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java index 24867cf18..766fbcf76 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java @@ -8,13 +8,8 @@ * 启动器 *

* - * @package: com.xkcoding.zookeeper - * @description: 启动器 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:51 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:51 */ @SpringBootApplication public class SpringBootDemoZookeeperApplication { diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java index c010e6b50..1f2d3024a 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java @@ -7,13 +7,8 @@ * 分布式锁动态key注解,配置之后key的值会动态获取参数内容 *

* - * @package: com.xkcoding.zookeeper.annotation - * @description: 分布式锁动态key注解,配置之后key的值会动态获取参数内容 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:17 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:17 */ @Target({ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java index 6be11203f..6e0f56238 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java @@ -9,13 +9,8 @@ * 在需要加锁的方法上打上该注解后,AOP会帮助你统一管理这个方法的锁 *

* - * @package: com.xkcoding.zookeeper.annotation - * @description: 基于Zookeeper的分布式锁注解,在需要加锁的方法上打上该注解后,AOP会帮助你统一管理这个方法的锁 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:11 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:11 */ @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java index de1bb3d2c..068b7f0ab 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java @@ -25,13 +25,8 @@ * 使用 aop 切面记录请求日志信息 *

* - * @package: com.xkcoding.log.aop.aspectj - * @description: 使用 aop 切面记录请求日志信息 - * @author: yangkai.shen - * @date: Created in 2018/10/1 10:05 PM - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-10-01 22:05 */ @Aspect @Component diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java index 5f5a6562c..3c25c69e9 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java @@ -15,13 +15,8 @@ * Zookeeper配置类 *

* - * @package: com.xkcoding.zookeeper.config - * @description: Zookeeper配置类 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:45 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:45 */ @Configuration @EnableConfigurationProperties(ZkProps.class) diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java index a944fb729..561c55ba5 100644 --- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java +++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java @@ -8,13 +8,8 @@ * Zookeeper 配置项 *

* - * @package: com.xkcoding.zookeeper.config.props - * @description: Zookeeper 配置项 - * @author: yangkai.shen - * @date: Created in 2018-12-27 14:47 - * @copyright: Copyright (c) 2018 - * @version: V1.0 - * @modified: yangkai.shen + * @author yangkai.shen + * @date Created in 2018-12-27 14:47 */ @Data @ConfigurationProperties(prefix = "zk") From 181afbcfce5d9241c6648da3fb363561143238c1 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Sun, 25 Oct 2020 11:42:15 +0800 Subject: [PATCH 04/16] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 397 +++++++++++---------------------------------------- README.md | 395 +++++++++++--------------------------------------- 2 files changed, 167 insertions(+), 625 deletions(-) diff --git a/README.en.md b/README.en.md index 4ed7873e0..e949b4dd2 100644 --- a/README.en.md +++ b/README.en.md @@ -5,7 +5,7 @@ author JDK Spring Boot - LICENSE + LICENSE

@@ -26,11 +26,6 @@ This project has integrated actuator (`monitoring`), admin (`visual monitoring`) > If you have demos to contribute or needs to meet, it is very welcome to submit a [issue](https://github.com/xkcoding/spring-boot-demo/issues/new) and I will add it to my [TODO](./TODO.en.md) list. -## Thanks - -- jetbrains**Thanks JetBrains Offer Open Source Free License** -- [Thanks MyBatisCodeHelper-Pro(The Best Code Generator Plugin) Offer Permanent Activation Code](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro) - ## Branch Introduction - branch master: Based on Spring Boot version `2.1.0.RELEASE`. Every module's parent dependency is the pom.xml at root directory in convenience of managing common dependencies and learning spring boot. @@ -55,318 +50,12 @@ This project has integrated actuator (`monitoring`), admin (`visual monitoring`) 6. **`Note: Each demo has a detailed README file. Remember to check it before running the demo~`** 7. **`Note: In some condition you have to execute sql to prepare data before running demo, don't forget it~`** -## TODO - -View the [TODO](./TODO.en.md) file - -## Introduction of each Module - -| Module Name | Module Description | -| ------------------------------------------------------------ | ------------------------------------------------------------ | -| [spring-boot-demo-helloworld](./spring-boot-demo-helloworld) | a helloworld demo. | -| [spring-boot-demo-properties](./spring-boot-demo-properties) | a demo to read the contents of configuration file. | -| [spring-boot-demo-actuator](./spring-boot-demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. | -| [spring-boot-demo-admin-client](./spring-boot-demo-admin/spring-boot-demo-admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. | -| [spring-boot-demo-admin-server](./spring-boot-demo-admin/spring-boot-demo-admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. | -| [spring-boot-demo-logback](./spring-boot-demo-logback) | a demo to integrate the logback for logging. | -| [spring-boot-demo-log-aop](./spring-boot-demo-log-aop) | a demo to record web request logs using AOP aspect. | -| [spring-boot-demo-exception-handler](./spring-boot-demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. | -| [spring-boot-demo-template-freemarker](./spring-boot-demo-template-freemarker) | a demo to integrate Freemarker template engine. | -| [spring-boot-demo-template-thymeleaf](./spring-boot-demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. | -| [spring-boot-demo-template-beetl](./spring-boot-demo-template-beetl) | a demo to integrate Beetl template engine. | -| [spring-boot-demo-template-enjoy](./spring-boot-demo-template-enjoy) | a demo to integrate Enjoy template engine. | -| [spring-boot-demo-orm-jdbctemplate](./spring-boot-demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. | -| [spring-boot-demo-orm-jpa](./spring-boot-demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. | -| [spring-boot-demo-orm-mybatis](./spring-boot-demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. | -| [spring-boot-demo-orm-mybatis-mapper-page](./spring-boot-demo-orm-mybatis-mapper-page) | a demo to integrate [Mapper](https://github.com/abel533/Mapper) and [PageHelper](https://github.com/pagehelper/Mybatis-PageHelper) by using [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) and [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) dependencies. | -| [spring-boot-demo-orm-mybatis-plus](./spring-boot-demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. | -| [spring-boot-demo-orm-beetlsql](./spring-boot-demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. | -| [spring-boot-demo-upload](./spring-boot-demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. | -| [spring-boot-demo-cache-redis](./spring-boot-demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. | -| [spring-boot-demo-cache-ehcache](./spring-boot-demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. | -| [spring-boot-demo-email](./spring-boot-demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. | -| [spring-boot-demo-task](./spring-boot-demo-task) | a demo to show easy to use scheduled task. | -| [spring-boot-demo-task-quartz](./spring-boot-demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. | -| [spring-boot-demo-task-xxl-job](./spring-boot-demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. | -| [spring-boot-demo-swagger](./spring-boot-demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. | -| [spring-boot-demo-swagger-beauty](./spring-boot-demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. | -| [spring-boot-demo-rbac-security](./spring-boot-demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. | -| [spring-boot-demo-rbac-shiro](./spring-boot-demo-rbac-shiro) | NOT FINISHED YET!
a demo to integrate shiro for authentication management. | -| [spring-boot-demo-session](./spring-boot-demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. | -| [spring-boot-demo-oauth](./spring-boot-demo-oauth) | NOT FINISHED YET!
a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. | -| [spring-boot-demo-social](./spring-boot-demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. | -| [spring-boot-demo-zookeeper](./spring-boot-demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. | -| [spring-boot-demo-mq-rabbitmq](./spring-boot-demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. | -| [spring-boot-demo-mq-rocketmq](./spring-boot-demo-mq-rocketmq) | NOT FINISHED YET!
a demo to integrate RocketMQ implementation for message delivery and reception. | -| [spring-boot-demo-mq-kafka](./spring-boot-demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. | -| [spring-boot-demo-websocket](./spring-boot-demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | -| [spring-boot-demo-websocket-socketio](./spring-boot-demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. | -| [spring-boot-demo-ureport2](./spring-boot-demo-ureport2) | NOT FINISHED YET!
a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. | -| [spring-boot-demo-uflo](./spring-boot-demo-uflo) | NOT FINISHED YET!
a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. | -| [spring-boot-demo-urule](./spring-boot-demo-urule) | NOT FINISHED YET!
a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. | -| [spring-boot-demo-activiti](./spring-boot-demo-activiti) | NOT FINISHED YET!
a demo to integrate Activiti 7 process engine. | -| [spring-boot-demo-async](./spring-boot-demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. | -| [spring-boot-demo-war](./spring-boot-demo-war) | packaged into a war format configuration | -| [spring-boot-demo-elasticsearch](./spring-boot-demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. | -| [spring-boot-demo-dubbo](./spring-boot-demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. | -| [spring-boot-demo-mongodb](./spring-boot-demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. | -| [spring-boot-demo-neo4j](./spring-boot-demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. | -| [spring-boot-demo-docker](./spring-boot-demo-docker) | docker container. | -| [spring-boot-demo-multi-datasource-jpa](./spring-boot-demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. | -| [spring-boot-demo-multi-datasource-mybatis](./spring-boot-demo-multi-datasource-mybatis) | a demo to implement Mybatis multi-datasource by using an open source solution from Mybatis-Plus. | -| [spring-boot-demo-sharding-jdbc](./spring-boot-demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. | -| [spring-boot-demo-tio](./spring-boot-demo-tio) | NOT FINISHED YET!
a demo to integrate t-io(a network programming framework like netty). | -| [spring-boot-demo-grpc](./spring-boot-demo-grpc) | NOT FINISHED YET!
a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). | -| [spring-boot-demo-codegen](./spring-boot-demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. | -| [spring-boot-demo-graylog](./spring-boot-demo-graylog) | a demo to integrate graylog for unified log collection. | -| spring-boot-demo-sso | NOT FINISHED YET!
a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). | -| [spring-boot-demo-ldap](./spring-boot-demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). | -| [spring-boot-demo-dynamic-datasource](./spring-boot-demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. | -| [spring-boot-demo-ratelimit-guava](./spring-boot-demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. | -| [spring-boot-demo-ratelimit-redis](./spring-boot-demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. | -| [spring-boot-demo-https](./spring-boot-demo-https) | a demo to integrate HTTPS. | -| [spring-boot-demo-elasticsearch-rest-high-level-client](./spring-boot-demo-elasticsearch-rest-high-level-client) | a demo to integrate ElasticSearch 7.x version by using official Rest High Level Client to operate ES data. | -| [spring-boot-demo-flyway](./spring-boot-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. | - -## License - -[MIT](http://opensource.org/licenses/MIT) - -Copyright (c) 2018 Yangkai.Shen - ## Stargazers over time [![Stargazers over time](https://starchart.cc/xkcoding/spring-boot-demo.svg)](https://starchart.cc/xkcoding/spring-boot-demo) ## Appendix -### Pom.xml in the root directory - -```xml - - - - 4.0.0 - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - spring-boot-demo-helloworld - spring-boot-demo-properties - spring-boot-demo-actuator - spring-boot-demo-admin - spring-boot-demo-logback - spring-boot-demo-log-aop - spring-boot-demo-exception-handler - spring-boot-demo-template-freemarker - spring-boot-demo-template-thymeleaf - spring-boot-demo-template-beetl - spring-boot-demo-template-enjoy - spring-boot-demo-orm-jdbctemplate - spring-boot-demo-orm-jpa - spring-boot-demo-orm-mybatis - spring-boot-demo-orm-mybatis-mapper-page - spring-boot-demo-orm-mybatis-plus - spring-boot-demo-orm-beetlsql - spring-boot-demo-upload - spring-boot-demo-cache-redis - spring-boot-demo-cache-ehcache - spring-boot-demo-email - spring-boot-demo-task - spring-boot-demo-task-quartz - spring-boot-demo-task-xxl-job - spring-boot-demo-swagger - spring-boot-demo-swagger-beauty - spring-boot-demo-rbac-security - spring-boot-demo-rbac-shiro - spring-boot-demo-session - spring-boot-demo-oauth - spring-boot-demo-social - spring-boot-demo-zookeeper - spring-boot-demo-mq-rabbitmq - spring-boot-demo-mq-rocketmq - spring-boot-demo-mq-kafka - spring-boot-demo-websocket - spring-boot-demo-websocket-socketio - spring-boot-demo-ureport2 - spring-boot-demo-uflo - spring-boot-demo-urule - spring-boot-demo-activiti - spring-boot-demo-async - spring-boot-demo-dubbo - spring-boot-demo-war - spring-boot-demo-elasticsearch - spring-boot-demo-mongodb - spring-boot-demo-neo4j - spring-boot-demo-docker - spring-boot-demo-multi-datasource-jpa - spring-boot-demo-multi-datasource-mybatis - spring-boot-demo-sharding-jdbc - spring-boot-demo-tio - spring-boot-demo-codegen - spring-boot-demo-graylog - spring-boot-demo-ldap - spring-boot-demo-dynamic-datasource - spring-boot-demo-ratelimit-guava - spring-boot-demo-ratelimit-redis - spring-boot-demo-elasticsearch-rest-high-level-client - spring-boot-demo-https - spring-boot-demo-flyway - - pom - - spring-boot-demo - http://xkcoding.com - - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - 2.1.0.RELEASE - 8.0.12 - 5.0.0 - 28.1-jre - 1.20 - - - - - aliyun - aliyun - https://maven.aliyun.com/repository/public - - true - - - false - - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - mysql - mysql-connector-java - ${mysql.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.google.guava - guava - ${guava.version} - - - - eu.bitwalker - UserAgentUtils - ${user.agent.version} - - - - - - - - - maven-clean-plugin - 3.0.0 - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.7.0 - - - maven-surefire-plugin - 2.20.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - - -``` - -### Official starter introduction - -| Name | Description | -| :------------------------------------- | :----------------------------------------------------------- | -| spring-boot-starter | The core Spring Boot starter, including auto-configuration support, logging and YAML. | -| spring-boot-starter-actuator | Production ready features to help you monitor and manage your application. | -| spring-boot-starter-amqp | Support for RabbitMQ messages | -| spring-boot-starter-aop | Support for aspect-oriented programming including spring-aop and AspectJ. | -| spring-boot-starter-batch | Support for “Spring Batch” including HSQLDB database. | -| spring-boot-starter-cache | Support for Spring’s Cache abstraction. | -| spring-boot-starter-data-elasticsearch | Support for the Elasticsearch search and analytics engine including spring-data-elasticsearch. | -| spring-boot-starter-data-jpa | Support for the “Java Persistence API” including spring-data-jpa, spring-orm and Hibernate. | -| spring-boot-starter-data-mongodb | Support for the MongoDB NoSQL Database, including spring-data-mongodb. | -| spring-boot-starter-data-rest | Support for exposing Spring Data repositories over REST via spring-data-rest-webmvc. | -| spring-boot-starter-data-solr | Support for the Apache Solr search platform, including spring-data-solr. | -| spring-boot-starter-freemarker | Support for the FreeMarker templating engine. | -| spring-boot-starter-groovy-templates | Support for the Groovy templating engine. | -| spring-boot-starter-integration | Support for common spring-integration modules. | -| spring-boot-starter-jdbc | Support for JDBC databases. | -| spring-boot-starter-jersey | Support for the Jersey RESTful Web Services framework. | -| spring-boot-starter-jta-atomikos | Support for JTA distributed transactions via Atomikos. | -| spring-boot-starter-jta-bitronix | Support for JTA distributed transactions via Bitronix. | -| spring-boot-starter-mail | Support for javax.mail. | -| spring-boot-starter-mustache | Support for the Mustache templating engine. | -| spring-boot-starter-redis | Support for the REDIS key-value data store, including spring-redis. | -| spring-boot-starter-security | Support for spring-security. | -| spring-boot-starter-social-facebook | Support for spring-social-facebook. | -| spring-boot-starter-social-linkedin | Support for spring-social-linkedin. | -| spring-boot-starter-social-twitter | Support for spring-social-twitter. | -| spring-boot-starter-test | Support for common test dependencies, including JUnit, Hamcrest and Mockito along with the spring-test module. | -| spring-boot-starter-thymeleaf | Support for the Thymeleaf templating engine, including integration with Spring. | -| spring-boot-starter-velocity | Support for the Velocity templating engine. | -| spring-boot-starter-web | Support for full-stack web development, including Tomcat and spring-webmvc. | -| spring-boot-starter-websocket | Support for WebSocket development. | -| spring-boot-starter-ws | Support for Spring Web Services. | - ### Recommended Open source - `JustAuth`:The most comprehensive open source library for third-party logins in history,https://github.com/justauth/JustAuth @@ -375,6 +64,86 @@ Copyright (c) 2018 Yangkai.Shen - `SpringBlade`:Complete micro-service online solution (required for enterprise development),https://github.com/chillzhuang/SpringBlade - `Pig`:The universe's strongest micro-service certification authorized scaffolding (architect necessary),https://github.com/pigxcloud/pig -### Advertisement +### TODO + +View the [TODO](./TODO.en.md) file + +### Introduction of each Module -[![JD_CLOUD](assets/jdcloud.jpg)](https://re.jdcloud.com/cps?returnUrl=aHR0cHM6Ly93d3cuamRjbG91ZC5jb20vY24vYWN0aXZpdHkveWVhci1lbmQ_bUlkPTE4JmNwc0tleT1iMjg2Y2Q0ZmExMWM0ODZhODU2NmUwNjc5MGQ0MzY4MA==) +| Module Name | Module Description | +| ------------------------------------------------------------ | ------------------------------------------------------------ | +| [demo-helloworld](./demo-helloworld) | a helloworld demo. | +| [demo-properties](./demo-properties) | a demo to read the contents of configuration file. | +| [demo-actuator](./demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. | +| [demo-admin-client](./demo-admin/admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. | +| [demo-admin-server](./demo-admin/admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. | +| [demo-logback](./demo-logback) | a demo to integrate the logback for logging. | +| [demo-log-aop](./demo-log-aop) | a demo to record web request logs using AOP aspect. | +| [demo-exception-handler](./demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. | +| [demo-template-freemarker](./demo-template-freemarker) | a demo to integrate Freemarker template engine. | +| [demo-template-thymeleaf](./demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. | +| [demo-template-beetl](./demo-template-beetl) | a demo to integrate Beetl template engine. | +| [demo-template-enjoy](./demo-template-enjoy) | a demo to integrate Enjoy template engine. | +| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. | +| [demo-orm-jpa](./demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. | +| [demo-orm-mybatis](./demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. | +| [demo-orm-mybatis-mapper-page](./demo-orm-mybatis-mapper-page) | a demo to integrate [Mapper](https://github.com/abel533/Mapper) and [PageHelper](https://github.com/pagehelper/Mybatis-PageHelper) by using [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) and [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) dependencies. | +| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. | +| [demo-orm-beetlsql](./demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. | +| [demo-upload](./demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. | +| [demo-cache-redis](./demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. | +| [demo-cache-ehcache](./demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. | +| [demo-email](./demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. | +| [demo-task](./demo-task) | a demo to show easy to use scheduled task. | +| [demo-task-quartz](./demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. | +| [demo-task-xxl-job](./demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. | +| [demo-swagger](./demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. | +| [demo-swagger-beauty](./demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. | +| [demo-rbac-security](./demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. | +| [demo-rbac-shiro](./demo-rbac-shiro) | NOT FINISHED YET!
a demo to integrate shiro for authentication management. | +| [demo-session](./demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. | +| [demo-oauth](./demo-oauth) | NOT FINISHED YET!
a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. | +| [demo-social](./demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. | +| [demo-zookeeper](./demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. | +| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. | +| [demo-mq-rocketmq](./demo-mq-rocketmq) | NOT FINISHED YET!
a demo to integrate RocketMQ implementation for message delivery and reception. | +| [demo-mq-kafka](./demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. | +| [demo-websocket](./demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | +| [demo-websocket-socketio](./demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. | +| [demo-ureport2](./demo-ureport2) | NOT FINISHED YET!
a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. | +| [demo-uflo](./demo-uflo) | NOT FINISHED YET!
a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. | +| [demo-urule](./demo-urule) | NOT FINISHED YET!
a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. | +| [demo-activiti](./demo-activiti) | NOT FINISHED YET!
a demo to integrate Activiti 7 process engine. | +| [demo-async](./demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. | +| [demo-war](./demo-war) | packaged into a war format configuration | +| [demo-elasticsearch](./demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. | +| [demo-dubbo](./demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. | +| [demo-mongodb](./demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. | +| [demo-neo4j](./demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. | +| [demo-docker](./demo-docker) | docker container. | +| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. | +| [demo-multi-datasource-mybatis](./demo-multi-datasource-mybatis) | a demo to implement Mybatis multi-datasource by using an open source solution from Mybatis-Plus. | +| [demo-sharding-jdbc](./demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. | +| [demo-tio](./demo-tio) | NOT FINISHED YET!
a demo to integrate t-io(a network programming framework like netty). | +| demo-grpc | NOT FINISHED YET!
a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). | +| [demo-codegen](./demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. | +| [demo-graylog](./demo-graylog) | a demo to integrate graylog for unified log collection. | +| demo-sso | NOT FINISHED YET!
a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). | +| [demo-ldap](./demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). | +| [demo-dynamic-datasource](./demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. | +| [demo-ratelimit-guava](./demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. | +| [demo-ratelimit-redis](./demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. | +| [demo-https](./demo-https) | a demo to integrate HTTPS. | +| [demo-elasticsearch-rest-high-level-client](./demo-elasticsearch-rest-high-level-client) | a demo to integrate ElasticSearch 7.x version by using official Rest High Level Client to operate ES data. | +| [demo-flyway](./demo-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. | + +### Thanks + +- jetbrains**Thanks JetBrains Offer Open Source Free License** +- [Thanks MyBatisCodeHelper-Pro(The Best Code Generator Plugin) Offer Permanent Activation Code](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro) + +### License + +[MIT](http://opensource.org/licenses/MIT) + +Copyright (c) 2018 Yangkai.Shen diff --git a/README.md b/README.md index c6c493f15..b44b5e947 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ author JDK Spring Boot - LICENSE + LICENSE

@@ -26,12 +26,6 @@ > 如果大家还有想要集成的demo,也可在 [issue](https://github.com/xkcoding/spring-boot-demo/issues/new) 里提需求。我会额外添加在 [TODO](./TODO.md) 列表里。✊ -## 感谢 - -- jetbrains**感谢 JetBrains 提供的免费开源 License** - -- [感谢史上最牛的代码生成插件 MyBatisCodeHelper-Pro 提供的永久激活码](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro) - ## 分支介绍 - master 分支:基于 Spring Boot 版本 `2.1.0.RELEASE`,每个 Module 的 parent 依赖根目录下的 pom.xml,主要用于管理每个 Module 的通用依赖版本,方便大家学习。 @@ -56,322 +50,101 @@ 6. **`注意:每个 demo 均有详细的 README 配套,食用 demo 前记得先看看哦~`** 7. **`注意:运行各个 demo 之前,有些是需要事先初始化数据库数据的,亲们别忘记了哦~`** -## 开发计划 - -查看 [TODO](./TODO.md) 文件 - -## 各 Module 介绍 - -| Module 名称 | Module 介绍 | -| ------------------------------------------------------------ | ------------------------------------------------------------ | -| [spring-boot-demo-helloworld](./spring-boot-demo-helloworld) | spring-boot 的一个 helloworld | -| [spring-boot-demo-properties](./spring-boot-demo-properties) | spring-boot 读取配置文件中的内容 | -| [spring-boot-demo-actuator](./spring-boot-demo-actuator) | spring-boot 集成 spring-boot-starter-actuator 用于监控 spring-boot 的启动和运行状态 | -| [spring-boot-demo-admin-client](./spring-boot-demo-admin/spring-boot-demo-admin-client) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,客户端示例 | -| [spring-boot-demo-admin-server](./spring-boot-demo-admin/spring-boot-demo-admin-server) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,服务端示例 | -| [spring-boot-demo-logback](./spring-boot-demo-logback) | spring-boot 集成 logback 日志 | -| [spring-boot-demo-log-aop](./spring-boot-demo-log-aop) | spring-boot 使用 AOP 切面的方式记录 web 请求日志 | -| [spring-boot-demo-exception-handler](./spring-boot-demo-exception-handler) | spring-boot 统一异常处理,包括2种,第一种返回统一的 json 格式,第二种统一跳转到异常页面 | -| [spring-boot-demo-template-freemarker](./spring-boot-demo-template-freemarker) | spring-boot 集成 Freemarker 模板引擎 | -| [spring-boot-demo-template-thymeleaf](./spring-boot-demo-template-thymeleaf) | spring-boot 集成 Thymeleaf 模板引擎 | -| [spring-boot-demo-template-beetl](./spring-boot-demo-template-beetl) | spring-boot 集成 Beetl 模板引擎 | -| [spring-boot-demo-template-enjoy](./spring-boot-demo-template-enjoy) | spring-boot 集成 Enjoy 模板引擎 | -| [spring-boot-demo-orm-jdbctemplate](./spring-boot-demo-orm-jdbctemplate) | spring-boot 集成 Jdbc Template 操作数据库,并简易封装通用 Dao 层 | -| [spring-boot-demo-orm-jpa](./spring-boot-demo-orm-jpa) | spring-boot 集成 spring-boot-starter-data-jpa 操作数据库 | -| [spring-boot-demo-orm-mybatis](./spring-boot-demo-orm-mybatis) | spring-boot 集成原生mybatis,使用 [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) 集成 | -| [spring-boot-demo-orm-mybatis-mapper-page](./spring-boot-demo-orm-mybatis-mapper-page) | spring-boot 集成[通用Mapper](https://github.com/abel533/Mapper)和[PageHelper](https://github.com/pagehelper/Mybatis-PageHelper),使用 [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) 和 [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) 集成 | -| [spring-boot-demo-orm-mybatis-plus](./spring-boot-demo-orm-mybatis-plus) | spring-boot 集成 [mybatis-plus](https://mybatis.plus/),使用 [mybatis-plus-boot-starter](http://mp.baomidou.com/) 集成,集成 BaseMapper、BaseService、ActiveRecord 操作数据库 | -| [spring-boot-demo-orm-beetlsql](./spring-boot-demo-orm-beetlsql) | spring-boot 集成 [beetl-sql](http://ibeetl.com/guide/#beetlsql),使用 [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) 集成 | -| [spring-boot-demo-upload](./spring-boot-demo-upload) | spring-boot 文件上传示例,包含本地文件上传以及七牛云文件上传 | -| [spring-boot-demo-cache-redis](./spring-boot-demo-cache-redis) | spring-boot 整合 redis,操作redis中的数据,并使用redis缓存数据 | -| [spring-boot-demo-cache-ehcache](./spring-boot-demo-cache-ehcache) | spring-boot 整合 ehcache,使用 ehcache 缓存数据 | -| [spring-boot-demo-email](./spring-boot-demo-email) | spring-boot 整合 email,包括发送简单文本邮件、HTML邮件(包括模板HTML邮件)、附件邮件、静态资源邮件 | -| [spring-boot-demo-task](./spring-boot-demo-task) | spring-boot 快速实现定时任务 | -| [spring-boot-demo-task-quartz](./spring-boot-demo-task-quartz) | spring-boot 整合 quartz,并实现对定时任务的管理,包括新增定时任务,删除定时任务,暂停定时任务,恢复定时任务,修改定时任务启动时间,以及定时任务列表查询,`提供前端页面` | -| [spring-boot-demo-task-xxl-job](./spring-boot-demo-task-xxl-job) | spring-boot 整合[xxl-job](http://www.xuxueli.com/xxl-job/en/#/),并提供绕过 `xxl-job-admin` 对定时任务的管理的方法,包括定时任务列表,触发器列表,新增定时任务,删除定时任务,停止定时任务,启动定时任务,修改定时任务,手动触发定时任务 | -| [spring-boot-demo-swagger](./spring-boot-demo-swagger) | spring-boot 集成原生的 `swagger` 用于统一管理、测试 API 接口 | -| [spring-boot-demo-swagger-beauty](./spring-boot-demo-swagger-beauty) | spring-boot 集成第三方 `swagger` [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) 美化API文档样式,用于统一管理、测试 API 接口 | -| [spring-boot-demo-rbac-security](./spring-boot-demo-rbac-security) | spring-boot 集成 spring security 完成基于RBAC权限模型的权限管理,支持自定义过滤请求,动态权限认证,使用 JWT 安全认证,支持在线人数统计,手动踢出用户等操作 | -| [spring-boot-demo-rbac-shiro](./spring-boot-demo-rbac-shiro) | spring-boot 集成 shiro 实现权限管理
待完成 | -| [spring-boot-demo-session](./spring-boot-demo-session) | spring-boot 集成 Spring Session 实现Session共享、重启程序Session不失效 | -| [spring-boot-demo-oauth](./spring-boot-demo-oauth) | spring-boot 实现 oauth 服务器功能,实现授权码机制
待完成 | -| [spring-boot-demo-social](./spring-boot-demo-social) | spring-boot 集成第三方登录,集成 `justauth-spring-boot-starter` 实现QQ登录、GitHub登录、微信登录、谷歌登录、微软登录、小米登录、企业微信登录。 | -| [spring-boot-demo-zookeeper](./spring-boot-demo-zookeeper) | spring-boot 集成 Zookeeper 结合AOP实现分布式锁 | -| [spring-boot-demo-mq-rabbitmq](./spring-boot-demo-mq-rabbitmq) | spring-boot 集成 RabbitMQ 实现基于直接队列模式、分列模式、主题模式、延迟队列的消息发送和接收 | -| [spring-boot-demo-mq-rocketmq](./spring-boot-demo-mq-rocketmq) | spring-boot 集成 RocketMQ,实现消息的发送和接收
待完成 | -| [spring-boot-demo-mq-kafka](./spring-boot-demo-mq-kafka) | spring-boot 集成 kafka,实现消息的发送和接收 | -| [spring-boot-demo-websocket](./spring-boot-demo-websocket) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | -| [spring-boot-demo-websocket-socketio](./spring-boot-demo-websocket-socketio) | spring-boot 使用 netty-socketio 集成 websocket,实现一个简单的聊天室 | -| [spring-boot-demo-ureport2](./spring-boot-demo-ureport2) | spring-boot 集成 ureport2 实现复杂的自定义的中国式报表
待完成 | -| [spring-boot-demo-uflo](./spring-boot-demo-uflo) | spring-boot 集成 uflo 快速实现轻量级流程引擎
待完成 | -| [spring-boot-demo-urule](./spring-boot-demo-urule) | spring-boot 集成 urule 快速实现规则引擎
待完成 | -| [spring-boot-demo-activiti](./spring-boot-demo-activiti) | spring-boot 集成 activiti 7 流程引擎
待完成 | -| [spring-boot-demo-async](./spring-boot-demo-async) | spring-boot 使用原生提供的异步任务支持,实现异步执行任务 | -| [spring-boot-demo-war](./spring-boot-demo-war) | spring-boot 打成 war 包的配置 | -| [spring-boot-demo-elasticsearch](./spring-boot-demo-elasticsearch) | spring-boot 集成 ElasticSearch,集成 `spring-boot-starter-data-elasticsearch` 完成对 ElasticSearch 的高级使用技巧,包括创建索引、配置映射、删除索引、增删改查基本操作、复杂查询、高级查询、聚合查询等 | -| [spring-boot-demo-dubbo](./spring-boot-demo-dubbo) | spring-boot 集成 Dubbo,分别为公共模块 `spring-boot-demo-dubbo-common`、服务提供方`spring-boot-demo-dubbo-provider`、服务调用方`spring-boot-demo-dubbo-consumer` | -| [spring-boot-demo-mongodb](./spring-boot-demo-mongodb) | spring-boot 集成 MongoDB,使用官方的 starter 实现增删改查 | -| [spring-boot-demo-neo4j](./spring-boot-demo-neo4j) | spring-boot 集成 Neo4j 图数据库,实现一个校园人物关系网的demo | -| [spring-boot-demo-docker](./spring-boot-demo-docker) | spring-boot 容器化 | -| [spring-boot-demo-multi-datasource-jpa](./spring-boot-demo-multi-datasource-jpa) | spring-boot 使用JPA集成多数据源 | -| [spring-boot-demo-multi-datasource-mybatis](./spring-boot-demo-multi-datasource-mybatis) | spring-boot 使用Mybatis集成多数据源,使用 Mybatis-Plus 提供的开源解决方案实现 | -| [spring-boot-demo-sharding-jdbc](./spring-boot-demo-sharding-jdbc) | spring-boot 使用 `sharding-jdbc` 实现分库分表,同时ORM采用 Mybatis-Plus | -| [spring-boot-demo-tio](./spring-boot-demo-tio) | spring-boot 集成 tio 网络编程框架
待完成 | -| [spring-boot-demo-grpc](./spring-boot-demo-grpc) | spring-boot 集成grpc,配置tls/ssl,参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5)
待完成 | -| [spring-boot-demo-codegen](./spring-boot-demo-codegen) | spring-boot 集成 velocity 模板技术实现的代码生成器,简化开发 | -| [spring-boot-demo-graylog](./spring-boot-demo-graylog) | spring-boot 集成 graylog 实现日志统一收集 | -| spring-boot-demo-sso | spring-boot 集成 SSO 单点登录,参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12)
待完成 | -| [spring-boot-demo-ldap](./spring-boot-demo-ldap) | spring-boot 集成 LDAP,集成 `spring-boot-starter-data-ldap` 完成对 Ldap 的基本 CURD操作, 并给出以登录为实战的 API 示例,参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23),感谢 [@fxbin](https://github.com/fxbin) | -| [spring-boot-demo-dynamic-datasource](./spring-boot-demo-dynamic-datasource) | spring-boot 动态添加数据源、动态切换数据源 | -| [spring-boot-demo-ratelimit-guava](./spring-boot-demo-ratelimit-guava) | spring-boot 使用 Guava RateLimiter 实现单机版限流,保护 API | -| [spring-boot-demo-ratelimit-redis](./spring-boot-demo-ratelimit-redis) | spring-boot 使用 Redis + Lua 脚本实现分布式限流,保护 API | -| [spring-boot-demo-https](./spring-boot-demo-https) | spring-boot 集成 HTTPS | -| [spring-boot-demo-elasticsearch-rest-high-level-client](./spring-boot-demo-elasticsearch-rest-high-level-client) | spring boot 集成 ElasticSearch 7.x 版本,使用官方 Rest High Level Client 操作 ES 数据 | -| [spring-boot-demo-flyway](./spring-boot-demo-flyway) | spring boot 集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制 | - -## License - -[MIT](http://opensource.org/licenses/MIT) - -Copyright (c) 2018 Yangkai.Shen - ## 项目趋势 [![Stargazers over time](https://starchart.cc/xkcoding/spring-boot-demo.svg)](https://starchart.cc/xkcoding/spring-boot-demo) -## 附录 - -### 根目录下的 pom.xml - -```xml - +## 其他 - - 4.0.0 +### 开源推荐 - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - spring-boot-demo-helloworld - spring-boot-demo-properties - spring-boot-demo-actuator - spring-boot-demo-admin - spring-boot-demo-logback - spring-boot-demo-log-aop - spring-boot-demo-exception-handler - spring-boot-demo-template-freemarker - spring-boot-demo-template-thymeleaf - spring-boot-demo-template-beetl - spring-boot-demo-template-enjoy - spring-boot-demo-orm-jdbctemplate - spring-boot-demo-orm-jpa - spring-boot-demo-orm-mybatis - spring-boot-demo-orm-mybatis-mapper-page - spring-boot-demo-orm-mybatis-plus - spring-boot-demo-orm-beetlsql - spring-boot-demo-upload - spring-boot-demo-cache-redis - spring-boot-demo-cache-ehcache - spring-boot-demo-email - spring-boot-demo-task - spring-boot-demo-task-quartz - spring-boot-demo-task-xxl-job - spring-boot-demo-swagger - spring-boot-demo-swagger-beauty - spring-boot-demo-rbac-security - spring-boot-demo-rbac-shiro - spring-boot-demo-session - spring-boot-demo-oauth - spring-boot-demo-social - spring-boot-demo-zookeeper - spring-boot-demo-mq-rabbitmq - spring-boot-demo-mq-rocketmq - spring-boot-demo-mq-kafka - spring-boot-demo-websocket - spring-boot-demo-websocket-socketio - spring-boot-demo-ureport2 - spring-boot-demo-uflo - spring-boot-demo-urule - spring-boot-demo-activiti - spring-boot-demo-async - spring-boot-demo-dubbo - spring-boot-demo-war - spring-boot-demo-elasticsearch - spring-boot-demo-mongodb - spring-boot-demo-neo4j - spring-boot-demo-docker - spring-boot-demo-multi-datasource-jpa - spring-boot-demo-multi-datasource-mybatis - spring-boot-demo-sharding-jdbc - spring-boot-demo-tio - spring-boot-demo-codegen - spring-boot-demo-graylog - spring-boot-demo-ldap - spring-boot-demo-dynamic-datasource - spring-boot-demo-ratelimit-guava - spring-boot-demo-ratelimit-redis - spring-boot-demo-elasticsearch-rest-high-level-client - spring-boot-demo-https - spring-boot-demo-flyway - - pom +- `JustAuth`:史上最全的整合第三方登录的开源库,https://github.com/justauth/JustAuth +- `Mica`:SpringBoot 微服务高效开发工具集,https://github.com/lets-mica/mica +- `awesome-collector`:https://github.com/P-P-X/awesome-collector +- `SpringBlade`:完整的线上解决方案(企业开发必备),https://github.com/chillzhuang/SpringBlade +- `Pig`:宇宙最强微服务认证授权脚手架(架构师必备),https://github.com/pigxcloud/pig - spring-boot-demo - http://xkcoding.com +### 开发计划 - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - 2.1.0.RELEASE - 8.0.12 - 5.0.0 - 28.1-jre - 1.20 - +查看 [TODO](./TODO.md) 文件 - - - aliyun - aliyun - https://maven.aliyun.com/repository/public - - true - - - false - - - +### 各 Module 介绍 - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - mysql - mysql-connector-java - ${mysql.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.google.guava - guava - ${guava.version} - - - - eu.bitwalker - UserAgentUtils - ${user.agent.version} - - - +| Module 名称 | Module 介绍 | +| ------------------------------------------------------------ | ------------------------------------------------------------ | +| [demo-helloworld](./demo-helloworld) | spring-boot 的一个 helloworld | +| [demo-properties](./demo-properties) | spring-boot 读取配置文件中的内容 | +| [demo-actuator](./demo-actuator) | spring-boot 集成 spring-boot-starter-actuator 用于监控 spring-boot 的启动和运行状态 | +| [demo-admin-client](./demo-admin/admin-client) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,客户端示例 | +| [demo-admin-server](./demo-admin/admin-server) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,服务端示例 | +| [demo-logback](./demo-logback) | spring-boot 集成 logback 日志 | +| [demo-log-aop](./demo-log-aop) | spring-boot 使用 AOP 切面的方式记录 web 请求日志 | +| [demo-exception-handler](./demo-exception-handler) | spring-boot 统一异常处理,包括2种,第一种返回统一的 json 格式,第二种统一跳转到异常页面 | +| [demo-template-freemarker](./demo-template-freemarker) | spring-boot 集成 Freemarker 模板引擎 | +| [demo-template-thymeleaf](./demo-template-thymeleaf) | spring-boot 集成 Thymeleaf 模板引擎 | +| [demo-template-beetl](./demo-template-beetl) | spring-boot 集成 Beetl 模板引擎 | +| [demo-template-enjoy](./demo-template-enjoy) | spring-boot 集成 Enjoy 模板引擎 | +| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | spring-boot 集成 Jdbc Template 操作数据库,并简易封装通用 Dao 层 | +| [demo-orm-jpa](./demo-orm-jpa) | spring-boot 集成 spring-boot-starter-data-jpa 操作数据库 | +| [demo-orm-mybatis](./demo-orm-mybatis) | spring-boot 集成原生mybatis,使用 [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) 集成 | +| [demo-orm-mybatis-mapper-page](./demo-orm-mybatis-mapper-page) | spring-boot 集成[通用Mapper](https://github.com/abel533/Mapper)和[PageHelper](https://github.com/pagehelper/Mybatis-PageHelper),使用 [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) 和 [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) 集成 | +| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | spring-boot 集成 [mybatis-plus](https://mybatis.plus/),使用 [mybatis-plus-boot-starter](http://mp.baomidou.com/) 集成,集成 BaseMapper、BaseService、ActiveRecord 操作数据库 | +| [demo-orm-beetlsql](./demo-orm-beetlsql) | spring-boot 集成 [beetl-sql](http://ibeetl.com/guide/#beetlsql),使用 [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) 集成 | +| [demo-upload](./demo-upload) | spring-boot 文件上传示例,包含本地文件上传以及七牛云文件上传 | +| [demo-cache-redis](./demo-cache-redis) | spring-boot 整合 redis,操作redis中的数据,并使用redis缓存数据 | +| [demo-cache-ehcache](./demo-cache-ehcache) | spring-boot 整合 ehcache,使用 ehcache 缓存数据 | +| [demo-email](./demo-email) | spring-boot 整合 email,包括发送简单文本邮件、HTML邮件(包括模板HTML邮件)、附件邮件、静态资源邮件 | +| [demo-task](./demo-task) | spring-boot 快速实现定时任务 | +| [demo-task-quartz](./demo-task-quartz) | spring-boot 整合 quartz,并实现对定时任务的管理,包括新增定时任务,删除定时任务,暂停定时任务,恢复定时任务,修改定时任务启动时间,以及定时任务列表查询,`提供前端页面` | +| [demo-task-xxl-job](./demo-task-xxl-job) | spring-boot 整合[xxl-job](http://www.xuxueli.com/xxl-job/en/#/),并提供绕过 `xxl-job-admin` 对定时任务的管理的方法,包括定时任务列表,触发器列表,新增定时任务,删除定时任务,停止定时任务,启动定时任务,修改定时任务,手动触发定时任务 | +| [demo-swagger](./demo-swagger) | spring-boot 集成原生的 `swagger` 用于统一管理、测试 API 接口 | +| [demo-swagger-beauty](./demo-swagger-beauty) | spring-boot 集成第三方 `swagger` [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) 美化API文档样式,用于统一管理、测试 API 接口 | +| [demo-rbac-security](./demo-rbac-security) | spring-boot 集成 spring security 完成基于RBAC权限模型的权限管理,支持自定义过滤请求,动态权限认证,使用 JWT 安全认证,支持在线人数统计,手动踢出用户等操作 | +| [demo-rbac-shiro](./demo-rbac-shiro) | spring-boot 集成 shiro 实现权限管理
待完成 | +| [demo-session](./demo-session) | spring-boot 集成 Spring Session 实现Session共享、重启程序Session不失效 | +| [demo-oauth](./demo-oauth) | spring-boot 实现 oauth 服务器功能,实现授权码机制
待完成 | +| [demo-social](./demo-social) | spring-boot 集成第三方登录,集成 `justauth-spring-boot-starter` 实现QQ登录、GitHub登录、微信登录、谷歌登录、微软登录、小米登录、企业微信登录。 | +| [demo-zookeeper](./demo-zookeeper) | spring-boot 集成 Zookeeper 结合AOP实现分布式锁 | +| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | spring-boot 集成 RabbitMQ 实现基于直接队列模式、分列模式、主题模式、延迟队列的消息发送和接收 | +| [demo-mq-rocketmq](./demo-mq-rocketmq) | spring-boot 集成 RocketMQ,实现消息的发送和接收
待完成 | +| [demo-mq-kafka](./demo-mq-kafka) | spring-boot 集成 kafka,实现消息的发送和接收 | +| [demo-websocket](./demo-websocket) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | +| [demo-websocket-socketio](./demo-websocket-socketio) | spring-boot 使用 netty-socketio 集成 websocket,实现一个简单的聊天室 | +| [demo-ureport2](./demo-ureport2) | spring-boot 集成 ureport2 实现复杂的自定义的中国式报表
待完成 | +| [demo-uflo](./demo-uflo) | spring-boot 集成 uflo 快速实现轻量级流程引擎
待完成 | +| [demo-urule](./demo-urule) | spring-boot 集成 urule 快速实现规则引擎
待完成 | +| [demo-activiti](./demo-activiti) | spring-boot 集成 activiti 7 流程引擎
待完成 | +| [demo-async](./demo-async) | spring-boot 使用原生提供的异步任务支持,实现异步执行任务 | +| [demo-war](./demo-war) | spring-boot 打成 war 包的配置 | +| [demo-elasticsearch](./demo-elasticsearch) | spring-boot 集成 ElasticSearch,集成 `spring-boot-starter-data-elasticsearch` 完成对 ElasticSearch 的高级使用技巧,包括创建索引、配置映射、删除索引、增删改查基本操作、复杂查询、高级查询、聚合查询等 | +| [demo-dubbo](./demo-dubbo) | spring-boot 集成 Dubbo,分别为公共模块 `spring-boot-demo-dubbo-common`、服务提供方`spring-boot-demo-dubbo-provider`、服务调用方`spring-boot-demo-dubbo-consumer` | +| [demo-mongodb](./demo-mongodb) | spring-boot 集成 MongoDB,使用官方的 starter 实现增删改查 | +| [demo-neo4j](./demo-neo4j) | spring-boot 集成 Neo4j 图数据库,实现一个校园人物关系网的demo | +| [demo-docker](./demo-docker) | spring-boot 容器化 | +| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | spring-boot 使用JPA集成多数据源 | +| [demo-multi-datasource-mybatis](./demo-multi-datasource-mybatis) | spring-boot 使用Mybatis集成多数据源,使用 Mybatis-Plus 提供的开源解决方案实现 | +| [demo-sharding-jdbc](./demo-sharding-jdbc) | spring-boot 使用 `sharding-jdbc` 实现分库分表,同时ORM采用 Mybatis-Plus | +| [demo-tio](./demo-tio) | spring-boot 集成 tio 网络编程框架
待完成 | +| demo-grpc | spring-boot 集成grpc,配置tls/ssl,参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5)
待完成 | +| [demo-codegen](./demo-codegen) | spring-boot 集成 velocity 模板技术实现的代码生成器,简化开发 | +| [demo-graylog](./demo-graylog) | spring-boot 集成 graylog 实现日志统一收集 | +| demo-sso | spring-boot 集成 SSO 单点登录,参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12)
待完成 | +| [demo-ldap](./demo-ldap) | spring-boot 集成 LDAP,集成 `spring-boot-starter-data-ldap` 完成对 Ldap 的基本 CURD操作, 并给出以登录为实战的 API 示例,参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23),感谢 [@fxbin](https://github.com/fxbin) | +| [demo-dynamic-datasource](./demo-dynamic-datasource) | spring-boot 动态添加数据源、动态切换数据源 | +| [demo-ratelimit-guava](./demo-ratelimit-guava) | spring-boot 使用 Guava RateLimiter 实现单机版限流,保护 API | +| [demo-ratelimit-redis](./demo-ratelimit-redis) | spring-boot 使用 Redis + Lua 脚本实现分布式限流,保护 API | +| [demo-https](./demo-https) | spring-boot 集成 HTTPS | +| [demo-elasticsearch-rest-high-level-client](./demo-elasticsearch-rest-high-level-client) | spring boot 集成 ElasticSearch 7.x 版本,使用官方 Rest High Level Client 操作 ES 数据 | +| [demo-flyway](./demo-flyway) | spring boot 集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制 | + +### 感谢 - - - - - maven-clean-plugin - 3.0.0 - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.7.0 - - - maven-surefire-plugin - 2.20.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - - - -
-``` +- jetbrains**感谢 JetBrains 提供的免费开源 License** -### 官方提供的 starter 介绍 +- [感谢史上最牛的代码生成插件 MyBatisCodeHelper-Pro 提供的永久激活码](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro) -| 名称 | 描述 | -| :------------------------------------- | :---------------------------------------------------------- | -| spring-boot-starter | Spring Boot 核心包,包括自动装配,日志,以及YAML文件解析 | -| spring-boot-starter-actuator | 帮助在生产环境下监控和管理 Spring Boot 应用 | -| spring-boot-starter-amqp | Spring Boot 快速集成 RabbitMQ | -| spring-boot-starter-aop | 提供切面编程特性,包含 spring-aop 和 AspectJ 依赖 | -| spring-boot-starter-batch | 快速集成 Spring Batch 批处理框架,包括操作 HSQLDB 数据库 | -| spring-boot-starter-cache | Support for Spring’s Cache abstraction. | -| spring-boot-starter-data-elasticsearch | Spring Boot 快速集成 ElasticSearch 查询分析引擎 | -| spring-boot-starter-data-jpa | Spring Boot 快速集成 JPA 操作数据库 | -| spring-boot-starter-data-mongodb | Spring Boot 快速集成 MongoDB 非关系型数据库 | -| spring-boot-starter-data-rest | Spring Boot 暴露数据库查询端点为 REST 服务 | -| spring-boot-starter-data-solr | Spring Boot 快速集成 Solr 实现全文索引 | -| spring-boot-starter-freemarker | 提供 FreeMarker 模板引擎 | -| spring-boot-starter-groovy-templates | 提供 Groovy 模板引擎 | -| spring-boot-starter-integration | 提供通用的集成 spring-integration 模块 | -| spring-boot-starter-jdbc | 快速集成 JDBC 操作数据库 | -| spring-boot-starter-jersey | 提供 Jersey 提供 RESTful 服务 | -| spring-boot-starter-jta-atomikos | 集成 JTA Atomikos 实现分布式事务 | -| spring-boot-starter-jta-bitronix | 集成 JTA Bitronix 实现分布式事务 | -| spring-boot-starter-mail | 快速邮件集成 | -| spring-boot-starter-mustache | 提供 Mustache 模板引擎 | -| spring-boot-starter-redis | Spring Boot 快速集成 Redis | -| spring-boot-starter-security | Support for spring-security. | -| spring-boot-starter-social-facebook | Support for spring-social-facebook. | -| spring-boot-starter-social-linkedin | Support for spring-social-linkedin. | -| spring-boot-starter-social-twitter | Support for spring-social-twitter. | -| spring-boot-starter-test | 提供通用单元测试依赖,包括 JUnit, Hamcrest , Mockito | -| spring-boot-starter-thymeleaf | 提供 Thymeleaf 模板引擎,包括 Thymeleaf 的自动装配等 | -| spring-boot-starter-velocity | 提供 Velocity 模板引擎 | -| spring-boot-starter-web | 提供全栈的 web 开发特性,包括 Spring MVC 依赖和 Tomcat 容器 | -| spring-boot-starter-websocket | Spring Boot 集成 WebSocket 功能 | -| spring-boot-starter-ws | Spring Boot 集成 WebService 功能 | +### License -### 开源推荐 +[MIT](http://opensource.org/licenses/MIT) -- `JustAuth`:史上最全的整合第三方登录的开源库,https://github.com/justauth/JustAuth -- `Mica`:SpringBoot 微服务高效开发工具集,https://github.com/lets-mica/mica -- `awesome-collector`:https://github.com/P-P-X/awesome-collector -- `SpringBlade`:完整的线上解决方案(企业开发必备),https://github.com/chillzhuang/SpringBlade -- `Pig`:宇宙最强微服务认证授权脚手架(架构师必备),https://github.com/pigxcloud/pig +Copyright (c) 2018 Yangkai.Shen \ No newline at end of file From 286ce0f1b75c79bef47e8be122bfedccaa85b496 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 26 Oct 2020 11:15:50 +0800 Subject: [PATCH 05/16] =?UTF-8?q?:tada:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=94=AF=E4=BB=98demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-pay/.gitignore | 25 ++++++ demo-pay/README.md | 0 demo-pay/pom.xml | 85 +++++++++++++++++++ .../pay/SpringBootDemoPayApplication.java | 23 +++++ demo-pay/src/main/resources/application.yml | 4 + .../SpringBootDemoPayApplicationTests.java | 16 ++++ pom.xml | 3 +- 7 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 demo-pay/.gitignore create mode 100644 demo-pay/README.md create mode 100644 demo-pay/pom.xml create mode 100644 demo-pay/src/main/java/com/xkcoding/pay/SpringBootDemoPayApplication.java create mode 100644 demo-pay/src/main/resources/application.yml create mode 100644 demo-pay/src/test/java/com/xkcoding/pay/SpringBootDemoPayApplicationTests.java diff --git a/demo-pay/.gitignore b/demo-pay/.gitignore new file mode 100644 index 000000000..82eca336e --- /dev/null +++ b/demo-pay/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/demo-pay/README.md b/demo-pay/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/demo-pay/pom.xml b/demo-pay/pom.xml new file mode 100644 index 000000000..0c0c25241 --- /dev/null +++ b/demo-pay/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + demo-pay + 1.0.0-SNAPSHOT + jar + + demo-pay + Demo project for Spring Boot + + + com.xkcoding + spring-boot-demo + 1.0.0-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + 2.7.0 + 3.4.1 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + cn.hutool + hutool-all + + + + com.github.javen205 + IJPay-All + ${ijpay.version} + + + + com.google.zxing + core + ${zxing.version} + + + + com.google.zxing + javase + ${zxing.version} + + + + com.alipay.sdk + alipay-sdk-java + 4.10.159.ALL + + + + org.projectlombok + lombok + true + + + + + demo-pay + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/demo-pay/src/main/java/com/xkcoding/pay/SpringBootDemoPayApplication.java b/demo-pay/src/main/java/com/xkcoding/pay/SpringBootDemoPayApplication.java new file mode 100644 index 000000000..a8990feb5 --- /dev/null +++ b/demo-pay/src/main/java/com/xkcoding/pay/SpringBootDemoPayApplication.java @@ -0,0 +1,23 @@ +package com.xkcoding.pay; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 启动类 + *

+ * + * @author yangkai.shen + * @date Created in 2020-10-26 11:12 + */ +@SpringBootApplication +@RestController +public class SpringBootDemoPayApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoPayApplication.class, args); + } + +} diff --git a/demo-pay/src/main/resources/application.yml b/demo-pay/src/main/resources/application.yml new file mode 100644 index 000000000..a02fbde11 --- /dev/null +++ b/demo-pay/src/main/resources/application.yml @@ -0,0 +1,4 @@ +server: + port: 8080 + servlet: + context-path: /demo \ No newline at end of file diff --git a/demo-pay/src/test/java/com/xkcoding/pay/SpringBootDemoPayApplicationTests.java b/demo-pay/src/test/java/com/xkcoding/pay/SpringBootDemoPayApplicationTests.java new file mode 100644 index 000000000..6d655a6f1 --- /dev/null +++ b/demo-pay/src/test/java/com/xkcoding/pay/SpringBootDemoPayApplicationTests.java @@ -0,0 +1,16 @@ +package com.xkcoding.pay; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class SpringBootDemoPayApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/pom.xml b/pom.xml index 93b760b5e..0110e6452 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ demo-elasticsearch-rest-high-level-client demo-https demo-flyway + demo-pay pom @@ -83,7 +84,7 @@ 1.8 2.1.0.RELEASE 8.0.21 - 5.4.1 + 5.4.5 29.0-jre 1.20 From 45bcd495651a274e3e7477303936449de2dcea21 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 26 Oct 2020 22:12:00 +0800 Subject: [PATCH 06/16] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfiguration.java | 5 +- .../SpringBootDemoActuatorApplication.java | 6 +- ...pringBootDemoActuatorApplicationTests.java | 6 +- .../SpringBootDemoAdminClientApplication.java | 6 +- .../client/controller/IndexController.java | 8 +- ...ngBootDemoAdminClientApplicationTests.java | 6 +- .../SpringBootDemoAdminServerApplication.java | 6 +- ...ngBootDemoAdminServerApplicationTests.java | 6 +- .../xkcoding/codegen/utils/CodeGenUtil.java | 4 +- .../datasource/DatasourceHolder.java | 1 + .../datasource/DatasourceScheduler.java | 2 +- .../datasource/DynamicDataSource.java | 1 + .../xkcoding/elasticsearch/common/Result.java | 6 +- .../elasticsearch/service/PersonService.java | 16 +- .../service/impl/PersonServiceImpl.java | 2 +- ...BootDemoElasticsearchApplicationTests.java | 6 +- .../repository/PersonRepositoryTest.java | 7 +- .../SpringBootDemoEmailApplicationTests.java | 6 +- ...ngBootDemoExceptionHandlerApplication.java | 6 +- .../exception/handler/constant/Status.java | 40 +- .../handler/controller/TestController.java | 18 +- .../handler/exception/BaseException.java | 24 +- .../handler/exception/JsonException.java | 12 +- .../handler/exception/PageException.java | 12 +- .../handler/handler/DemoExceptionHandler.java | 54 +-- .../exception/handler/model/ApiResponse.java | 196 ++++----- ...tDemoExceptionHandlerApplicationTests.java | 6 +- .../src/test/java/com/xkcoding/AppTest.java | 12 +- .../SpringBootDemoHelloworldApplication.java | 32 +- ...ingBootDemoHelloworldApplicationTests.java | 6 +- .../src/main/resources/static/index.html | 2 +- .../java/com/xkcoding/ldap/api/Result.java | 6 +- .../java/com/xkcoding/ldap/entity/Person.java | 5 +- .../aop/SpringBootDemoLogAopApplication.java | 6 +- .../com/xkcoding/log/aop/aspectj/AopLog.java | 102 ++--- .../log/aop/controller/TestController.java | 20 +- .../SpringBootDemoLogAopApplicationTests.java | 6 +- .../SpringBootDemoLogbackApplication.java | 30 +- ...SpringBootDemoLogbackApplicationTests.java | 6 +- .../repository/ArticleRepositoryTest.java | 19 +- ...ingBootDemoMqRabbitmqApplicationTests.java | 9 +- .../jpa/config/PrimaryJpaConfig.java | 28 +- .../jpa/config/SecondJpaConfig.java | 28 +- .../jpa/config/SnowflakeConfig.java | 4 +- ...emoMultiDatasourceJpaApplicationTests.java | 4 +- .../xkcoding/neo4j/service/NeoService.java | 15 +- .../java/com/xkcoding/neo4j/Neo4jTest.java | 8 +- .../config/ClientLoginFailureHandler.java | 6 +- .../Oauth2AuthorizationServerConfig.java | 5 +- .../oauth/config/WebSecurityConfig.java | 15 +- .../xkcoding/oauth/config/package-info.java | 5 +- .../oauth/controller/Oauth2Controller.java | 5 +- .../oauth/controller/package-info.java | 2 +- .../com/xkcoding/oauth/entity/SysUser.java | 5 +- .../impl/SysClientDetailsServiceImpl.java | 17 +- .../service/impl/SysUserServiceImpl.java | 10 +- .../oauth/AuthorizationCodeGrantTests.java | 12 +- .../oauth/oauth/AuthorizationServerInfo.java | 6 +- .../ResourceOwnerPasswordGrantTests.java | 2 +- .../SpringBootDemoResourceApplication.java | 2 +- .../config/OauthResourceServerConfig.java | 4 +- .../config/OauthResourceTokenConfig.java | 10 +- .../com/xkcoding/oauth/AuthorizationTest.java | 3 +- .../oauth/controller/TestControllerTest.java | 12 +- .../orm/beetlsql/config/BeetlConfig.java | 2 +- ...ingBootDemoOrmJdbctemplateApplication.java | 6 +- .../orm/jdbctemplate/annotation/Column.java | 12 +- .../orm/jdbctemplate/annotation/Pk.java | 12 +- .../orm/jdbctemplate/annotation/Table.java | 12 +- .../orm/jdbctemplate/constant/Const.java | 16 +- .../controller/UserController.java | 72 ++-- .../orm/jdbctemplate/dao/UserDao.java | 100 ++--- .../orm/jdbctemplate/dao/base/BaseDao.java | 392 +++++++++--------- .../orm/jdbctemplate/entity/User.java | 92 ++-- .../jdbctemplate/service/IUserService.java | 80 ++-- .../service/impl/UserServiceImpl.java | 142 +++---- .../jpa/SpringBootDemoOrmJpaApplication.java | 6 +- .../MapperAndPage/mapper/UserMapperTest.java | 2 +- .../plus/config/MybatisPlusConfig.java | 2 +- ...ootDemoOrmMybatisPlusApplicationTests.java | 6 +- .../SpringBootDemoPropertiesApplication.java | 6 +- .../controller/PropertyController.java | 22 +- .../property/ApplicationProperty.java | 8 +- .../property/DeveloperProperty.java | 8 +- ...ingBootDemoPropertiesApplicationTests.java | 6 +- .../redis/aspect/RateLimiterAspect.java | 2 +- .../rbac/security/common/BaseException.java | 42 +- .../xkcoding/rbac/security/common/Status.java | 3 +- .../config/JwtAuthenticationFilter.java | 30 +- .../security/config/RbacAuthorityService.java | 28 +- .../rbac/security/config/WebMvcConfig.java | 5 +- .../security/controller/AuthController.java | 5 +- .../controller/MonitorController.java | 2 +- .../handler/GlobalExceptionHandler.java | 8 +- .../service/CustomUserDetailsService.java | 7 +- .../rbac/security/service/MonitorService.java | 21 +- .../xkcoding/rbac/security/util/JwtUtil.java | 19 +- .../rbac/security/util/RedisUtil.java | 4 +- .../rbac/security/util/ResponseUtil.java | 6 +- .../rbac/security/util/SecurityUtil.java | 4 +- .../rbac/security/vo/UserPrincipal.java | 11 +- .../security/repository/DataInitTest.java | 3 +- .../swagger/config/Swagger2Config.java | 12 +- .../swagger/controller/UserController.java | 10 +- ...pringBootDemoTemplateBeetlApplication.java | 6 +- .../beetl/controller/IndexController.java | 24 +- .../beetl/controller/UserController.java | 24 +- .../xkcoding/template/beetl/model/User.java | 4 +- ...BootDemoTemplateBeetlApplicationTests.java | 6 +- ...pringBootDemoTemplateEnjoyApplication.java | 6 +- .../template/enjoy/config/EnjoyConfig.java | 32 +- .../enjoy/controller/IndexController.java | 24 +- .../enjoy/controller/UserController.java | 24 +- .../xkcoding/template/enjoy/model/User.java | 4 +- ...BootDemoTemplateEnjoyApplicationTests.java | 6 +- ...BootDemoTemplateFreemarkerApplication.java | 6 +- .../controller/IndexController.java | 24 +- .../freemarker/controller/UserController.java | 24 +- .../template/freemarker/model/User.java | 4 +- ...emoTemplateFreemarkerApplicationTests.java | 6 +- ...gBootDemoTemplateThymeleafApplication.java | 6 +- .../thymeleaf/controller/IndexController.java | 24 +- .../thymeleaf/controller/UserController.java | 24 +- .../template/thymeleaf/model/User.java | 4 +- ...DemoTemplateThymeleafApplicationTests.java | 6 +- .../xkcoding/upload/config/UploadConfig.java | 110 ++--- .../upload/controller/UploadController.java | 112 ++--- .../upload/service/IQiNiuService.java | 16 +- .../upload/service/impl/QiNiuServiceImpl.java | 80 ++-- .../SpringBootDemoUploadApplicationTests.java | 6 +- .../SpringBootDemoWarApplicationTests.java | 6 +- .../websocket/socketio/config/Event.java | 8 +- .../socketio/handler/MessageEventHandler.java | 4 +- .../websocket/config/WebSocketConfig.java | 5 +- .../xkcoding/websocket/model/server/Cpu.java | 15 +- .../xkcoding/websocket/model/server/Jvm.java | 9 +- .../xkcoding/websocket/util/ServerUtil.java | 7 +- 137 files changed, 1329 insertions(+), 1500 deletions(-) diff --git a/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java index 0f9275a1b..5f46a2a5e 100644 --- a/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java +++ b/demo-activiti/src/main/java/com/xkcoding/activiti/config/SecurityConfiguration.java @@ -42,10 +42,7 @@ protected UserDetailsService myUserDetailsService() { for (String[] user : usersGroupsAndRoles) { List authoritiesStrings = Arrays.asList(Arrays.copyOfRange(user, 2, user.length)); log.info("> Registering new user: " + user[0] + " with the following Authorities[" + authoritiesStrings + "]"); - inMemoryUserDetailsManager.createUser(new User(user[0], passwordEncoder().encode(user[1]), authoritiesStrings - .stream() - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()))); + inMemoryUserDetailsManager.createUser(new User(user[0], passwordEncoder().encode(user[1]), authoritiesStrings.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList()))); } diff --git a/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java index 7e8b28d86..4630c8fb2 100644 --- a/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java +++ b/demo-actuator/src/main/java/com/xkcoding/actuator/SpringBootDemoActuatorApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoActuatorApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoActuatorApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoActuatorApplication.class, args); + } } diff --git a/demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java b/demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java index 4416b96f0..ac2d387df 100644 --- a/demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java +++ b/demo-actuator/src/test/java/com/xkcoding/actuator/SpringBootDemoActuatorApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoActuatorApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java index 1d38979f8..755bb8126 100644 --- a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java +++ b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoAdminClientApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoAdminClientApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoAdminClientApplication.class, args); + } } diff --git a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java index c835083e4..98f68ac18 100644 --- a/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java +++ b/demo-admin/admin-client/src/main/java/com/xkcoding/admin/client/controller/IndexController.java @@ -13,8 +13,8 @@ */ @RestController public class IndexController { - @GetMapping(value = {"", "/"}) - public String index() { - return "This is a Spring Boot Admin Client."; - } + @GetMapping(value = {"", "/"}) + public String index() { + return "This is a Spring Boot Admin Client."; + } } diff --git a/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java b/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java index 41b8cf862..283f40abd 100644 --- a/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java +++ b/demo-admin/admin-client/src/test/java/com/xkcoding/admin/client/SpringBootDemoAdminClientApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoAdminClientApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java b/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java index 110b240d6..5bf7bad49 100644 --- a/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java +++ b/demo-admin/admin-server/src/main/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplication.java @@ -16,7 +16,7 @@ @SpringBootApplication public class SpringBootDemoAdminServerApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoAdminServerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoAdminServerApplication.class, args); + } } diff --git a/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java b/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java index b3df7ee58..d70d4f8fa 100644 --- a/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java +++ b/demo-admin/admin-server/src/test/java/com/xkcoding/admin/server/SpringBootDemoAdminServerApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoAdminServerApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java index 248747e59..ace9a5334 100644 --- a/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java +++ b/demo-codegen/src/main/java/com/xkcoding/codegen/utils/CodeGenUtil.java @@ -179,9 +179,7 @@ public void generatorCode(GenConfig genConfig, Entity table, List column try { //添加到zip - zip.putNextEntry(new ZipEntry(Objects.requireNonNull(getFileName(template, tableEntity.getCaseClassName(), map - .get("package") - .toString(), map.get("moduleName").toString())))); + zip.putNextEntry(new ZipEntry(Objects.requireNonNull(getFileName(template, tableEntity.getCaseClassName(), map.get("package").toString(), map.get("moduleName").toString())))); IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString()); IoUtil.close(sw); zip.closeEntry(); diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java index dc873a564..7685a4fb3 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceHolder.java @@ -78,6 +78,7 @@ public synchronized void clearExpiredDatasource() { /** * 清除动态数据源 + * * @param id 数据源id */ public synchronized void removeDatasource(Long id) { diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java index e8ed62f15..3832f1ae2 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DatasourceScheduler.java @@ -37,7 +37,7 @@ private void shutdown() { } } - public void schedule(Runnable task,long delay){ + public void schedule(Runnable task, long delay) { this.scheduler.scheduleAtFixedRate(task, delay, delay, TimeUnit.MILLISECONDS); } diff --git a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java index f91c56345..4a852297f 100644 --- a/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java +++ b/demo-dynamic-datasource/src/main/java/com/xkcoding/dynamic/datasource/datasource/DynamicDataSource.java @@ -35,6 +35,7 @@ public Connection getConnection() throws SQLException { /** * 初始化数据源 + * * @param id 数据源id * @return 数据源 */ diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java index e9a073285..b0b12257c 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/common/Result.java @@ -54,7 +54,6 @@ private Result(int errcode, String errmsg, T data) { } - /** * 返回成功 * @@ -70,7 +69,7 @@ public static Result success() { * 返回成功-携带数据 * * @param data 响应数据 - * @param 泛型标记 + * @param 泛型标记 * @return 响应信息 {@code Result} */ public static Result success(@Nullable T data) { @@ -78,7 +77,4 @@ public static Result success(@Nullable T data) { } - - - } diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java index d37bd142c..c35a35117 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/PersonService.java @@ -17,51 +17,51 @@ public interface PersonService { /** * create Index * - * @author fxbin * @param index elasticsearch index name + * @author fxbin */ void createIndex(String index); /** * delete Index * - * @author fxbin * @param index elasticsearch index name + * @author fxbin */ void deleteIndex(String index); /** * insert document source * - * @author fxbin * @param index elasticsearch index name - * @param list data source + * @param list data source + * @author fxbin */ void insert(String index, List list); /** * update document source * - * @author fxbin * @param index elasticsearch index name - * @param list data source + * @param list data source + * @author fxbin */ void update(String index, List list); /** * delete document source * - * @author fxbin * @param person delete data source and allow null object + * @author fxbin */ void delete(String index, @Nullable Person person); /** * search all doc records * - * @author fxbin * @param index elasticsearch index name * @return person list + * @author fxbin */ List searchList(String index); diff --git a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java index f5d77b08d..ecbc52283 100644 --- a/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java +++ b/demo-elasticsearch-rest-high-level-client/src/main/java/com/xkcoding/elasticsearch/service/impl/PersonServiceImpl.java @@ -2,8 +2,8 @@ import cn.hutool.core.bean.BeanUtil; import com.xkcoding.elasticsearch.model.Person; -import com.xkcoding.elasticsearch.service.base.BaseElasticsearchService; import com.xkcoding.elasticsearch.service.PersonService; +import com.xkcoding.elasticsearch.service.base.BaseElasticsearchService; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit; diff --git a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java index 32b3f7ecd..e25bc501e 100644 --- a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java +++ b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/SpringBootDemoElasticsearchApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoElasticsearchApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java index 6a83ca437..c3b22c400 100644 --- a/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java +++ b/demo-elasticsearch/src/test/java/com/xkcoding/elasticsearch/repository/PersonRepositoryTest.java @@ -92,8 +92,7 @@ public void delete() { */ @Test public void select() { - repo.findAll(Sort.by(Sort.Direction.DESC, "birthday")) - .forEach(person -> log.info("{} 生日: {}", person.getName(), DateUtil.formatDateTime(person.getBirthday()))); + repo.findAll(Sort.by(Sort.Direction.DESC, "birthday")).forEach(person -> log.info("{} 生日: {}", person.getName(), DateUtil.formatDateTime(person.getBirthday()))); } /** @@ -167,8 +166,8 @@ public void advanceAgg() { // 1. 添加一个新的聚合,聚合类型为terms,聚合名称为country,聚合字段为age queryBuilder.addAggregation(AggregationBuilders.terms("country").field("country") - // 2. 在国家聚合桶内进行嵌套聚合,求平均年龄 - .subAggregation(AggregationBuilders.avg("avg").field("age"))); + // 2. 在国家聚合桶内进行嵌套聚合,求平均年龄 + .subAggregation(AggregationBuilders.avg("avg").field("age"))); log.info("【queryBuilder】= {}", JSONUtil.toJsonStr(queryBuilder.build())); diff --git a/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java b/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java index c0688933b..2b74a39c5 100644 --- a/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java +++ b/demo-email/src/test/java/com/xkcoding/email/SpringBootDemoEmailApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoEmailApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java index cc34a52ec..68c50c085 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoExceptionHandlerApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoExceptionHandlerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoExceptionHandlerApplication.class, args); + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java index b79a300c5..3f0eb1856 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/constant/Status.java @@ -12,26 +12,26 @@ */ @Getter public enum Status { - /** - * 操作成功 - */ - OK(200, "操作成功"), + /** + * 操作成功 + */ + OK(200, "操作成功"), - /** - * 未知异常 - */ - UNKNOWN_ERROR(500, "服务器出错啦"); - /** - * 状态码 - */ - private Integer code; - /** - * 内容 - */ - private String message; + /** + * 未知异常 + */ + UNKNOWN_ERROR(500, "服务器出错啦"); + /** + * 状态码 + */ + private Integer code; + /** + * 内容 + */ + private String message; - Status(Integer code, String message) { - this.code = code; - this.message = message; - } + Status(Integer code, String message) { + this.code = code; + this.message = message; + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java index 94e124735..493e93c55 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/controller/TestController.java @@ -20,14 +20,14 @@ @Controller public class TestController { - @GetMapping("/json") - @ResponseBody - public ApiResponse jsonException() { - throw new JsonException(Status.UNKNOWN_ERROR); - } + @GetMapping("/json") + @ResponseBody + public ApiResponse jsonException() { + throw new JsonException(Status.UNKNOWN_ERROR); + } - @GetMapping("/page") - public ModelAndView pageException() { - throw new PageException(Status.UNKNOWN_ERROR); - } + @GetMapping("/page") + public ModelAndView pageException() { + throw new PageException(Status.UNKNOWN_ERROR); + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java index 5fd4541a7..2d4200383 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/BaseException.java @@ -15,18 +15,18 @@ @Data @EqualsAndHashCode(callSuper = true) public class BaseException extends RuntimeException { - private Integer code; - private String message; + private Integer code; + private String message; - public BaseException(Status status) { - super(status.getMessage()); - this.code = status.getCode(); - this.message = status.getMessage(); - } + public BaseException(Status status) { + super(status.getMessage()); + this.code = status.getCode(); + this.message = status.getMessage(); + } - public BaseException(Integer code, String message) { - super(message); - this.code = code; - this.message = message; - } + public BaseException(Integer code, String message) { + super(message); + this.code = code; + this.message = message; + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java index 9fce44a79..fb71770da 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/JsonException.java @@ -14,11 +14,11 @@ @Getter public class JsonException extends BaseException { - public JsonException(Status status) { - super(status); - } + public JsonException(Status status) { + super(status); + } - public JsonException(Integer code, String message) { - super(code, message); - } + public JsonException(Integer code, String message) { + super(code, message); + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java index 9a92eae65..97c9ba766 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/exception/PageException.java @@ -14,11 +14,11 @@ @Getter public class PageException extends BaseException { - public PageException(Status status) { - super(status); - } + public PageException(Status status) { + super(status); + } - public PageException(Integer code, String message) { - super(code, message); - } + public PageException(Integer code, String message) { + super(code, message); + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java index 19b1d79f0..32eacf879 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/handler/DemoExceptionHandler.java @@ -20,33 +20,33 @@ @ControllerAdvice @Slf4j public class DemoExceptionHandler { - private static final String DEFAULT_ERROR_VIEW = "error"; + private static final String DEFAULT_ERROR_VIEW = "error"; - /** - * 统一 json 异常处理 - * - * @param exception JsonException - * @return 统一返回 json 格式 - */ - @ExceptionHandler(value = JsonException.class) - @ResponseBody - public ApiResponse jsonErrorHandler(JsonException exception) { - log.error("【JsonException】:{}", exception.getMessage()); - return ApiResponse.ofException(exception); - } + /** + * 统一 json 异常处理 + * + * @param exception JsonException + * @return 统一返回 json 格式 + */ + @ExceptionHandler(value = JsonException.class) + @ResponseBody + public ApiResponse jsonErrorHandler(JsonException exception) { + log.error("【JsonException】:{}", exception.getMessage()); + return ApiResponse.ofException(exception); + } - /** - * 统一 页面 异常处理 - * - * @param exception PageException - * @return 统一跳转到异常页面 - */ - @ExceptionHandler(value = PageException.class) - public ModelAndView pageErrorHandler(PageException exception) { - log.error("【DemoPageException】:{}", exception.getMessage()); - ModelAndView view = new ModelAndView(); - view.addObject("message", exception.getMessage()); - view.setViewName(DEFAULT_ERROR_VIEW); - return view; - } + /** + * 统一 页面 异常处理 + * + * @param exception PageException + * @return 统一跳转到异常页面 + */ + @ExceptionHandler(value = PageException.class) + public ModelAndView pageErrorHandler(PageException exception) { + log.error("【DemoPageException】:{}", exception.getMessage()); + ModelAndView view = new ModelAndView(); + view.addObject("message", exception.getMessage()); + view.setViewName(DEFAULT_ERROR_VIEW); + return view; + } } diff --git a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java index 7b028fde2..8c5fa7121 100644 --- a/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java +++ b/demo-exception-handler/src/main/java/com/xkcoding/exception/handler/model/ApiResponse.java @@ -14,114 +14,114 @@ */ @Data public class ApiResponse { - /** - * 状态码 - */ - private Integer code; + /** + * 状态码 + */ + private Integer code; - /** - * 返回内容 - */ - private String message; + /** + * 返回内容 + */ + private String message; - /** - * 返回数据 - */ - private Object data; + /** + * 返回数据 + */ + private Object data; - /** - * 无参构造函数 - */ - private ApiResponse() { + /** + * 无参构造函数 + */ + private ApiResponse() { - } + } - /** - * 全参构造函数 - * - * @param code 状态码 - * @param message 返回内容 - * @param data 返回数据 - */ - private ApiResponse(Integer code, String message, Object data) { - this.code = code; - this.message = message; - this.data = data; - } + /** + * 全参构造函数 + * + * @param code 状态码 + * @param message 返回内容 + * @param data 返回数据 + */ + private ApiResponse(Integer code, String message, Object data) { + this.code = code; + this.message = message; + this.data = data; + } - /** - * 构造一个自定义的API返回 - * - * @param code 状态码 - * @param message 返回内容 - * @param data 返回数据 - * @return ApiResponse - */ - public static ApiResponse of(Integer code, String message, Object data) { - return new ApiResponse(code, message, data); - } + /** + * 构造一个自定义的API返回 + * + * @param code 状态码 + * @param message 返回内容 + * @param data 返回数据 + * @return ApiResponse + */ + public static ApiResponse of(Integer code, String message, Object data) { + return new ApiResponse(code, message, data); + } - /** - * 构造一个成功且带数据的API返回 - * - * @param data 返回数据 - * @return ApiResponse - */ - public static ApiResponse ofSuccess(Object data) { - return ofStatus(Status.OK, data); - } + /** + * 构造一个成功且带数据的API返回 + * + * @param data 返回数据 + * @return ApiResponse + */ + public static ApiResponse ofSuccess(Object data) { + return ofStatus(Status.OK, data); + } - /** - * 构造一个成功且自定义消息的API返回 - * - * @param message 返回内容 - * @return ApiResponse - */ - public static ApiResponse ofMessage(String message) { - return of(Status.OK.getCode(), message, null); - } + /** + * 构造一个成功且自定义消息的API返回 + * + * @param message 返回内容 + * @return ApiResponse + */ + public static ApiResponse ofMessage(String message) { + return of(Status.OK.getCode(), message, null); + } - /** - * 构造一个有状态的API返回 - * - * @param status 状态 {@link Status} - * @return ApiResponse - */ - public static ApiResponse ofStatus(Status status) { - return ofStatus(status, null); - } + /** + * 构造一个有状态的API返回 + * + * @param status 状态 {@link Status} + * @return ApiResponse + */ + public static ApiResponse ofStatus(Status status) { + return ofStatus(status, null); + } - /** - * 构造一个有状态且带数据的API返回 - * - * @param status 状态 {@link Status} - * @param data 返回数据 - * @return ApiResponse - */ - public static ApiResponse ofStatus(Status status, Object data) { - return of(status.getCode(), status.getMessage(), data); - } + /** + * 构造一个有状态且带数据的API返回 + * + * @param status 状态 {@link Status} + * @param data 返回数据 + * @return ApiResponse + */ + public static ApiResponse ofStatus(Status status, Object data) { + return of(status.getCode(), status.getMessage(), data); + } - /** - * 构造一个异常且带数据的API返回 - * - * @param t 异常 - * @param data 返回数据 - * @param {@link BaseException} 的子类 - * @return ApiResponse - */ - public static ApiResponse ofException(T t, Object data) { - return of(t.getCode(), t.getMessage(), data); - } + /** + * 构造一个异常且带数据的API返回 + * + * @param t 异常 + * @param data 返回数据 + * @param {@link BaseException} 的子类 + * @return ApiResponse + */ + public static ApiResponse ofException(T t, Object data) { + return of(t.getCode(), t.getMessage(), data); + } - /** - * 构造一个异常且带数据的API返回 - * - * @param t 异常 - * @param {@link BaseException} 的子类 - * @return ApiResponse - */ - public static ApiResponse ofException(T t) { - return ofException(t, null); - } + /** + * 构造一个异常且带数据的API返回 + * + * @param t 异常 + * @param {@link BaseException} 的子类 + * @return ApiResponse + */ + public static ApiResponse ofException(T t) { + return ofException(t, null); + } } diff --git a/demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java b/demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java index 399902c7d..489e1b228 100644 --- a/demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java +++ b/demo-exception-handler/src/test/java/com/xkcoding/exception/handler/SpringBootDemoExceptionHandlerApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoExceptionHandlerApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-flyway/src/test/java/com/xkcoding/AppTest.java b/demo-flyway/src/test/java/com/xkcoding/AppTest.java index 16a8ef2c9..a6bfab6a6 100644 --- a/demo-flyway/src/test/java/com/xkcoding/AppTest.java +++ b/demo-flyway/src/test/java/com/xkcoding/AppTest.java @@ -1,20 +1,18 @@ package com.xkcoding; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */ -public class AppTest -{ +public class AppTest { /** * Rigorous Test :-) */ @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); + public void shouldAnswerWithTrue() { + assertTrue(true); } } diff --git a/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java b/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java index 90433cb3d..55b3be694 100644 --- a/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java +++ b/demo-helloworld/src/main/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplication.java @@ -19,21 +19,21 @@ @RestController public class SpringBootDemoHelloworldApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoHelloworldApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoHelloworldApplication.class, args); + } - /** - * Hello,World - * - * @param who 参数,非必须 - * @return Hello, ${who} - */ - @GetMapping("/hello") - public String sayHello(@RequestParam(required = false, name = "who") String who) { - if (StrUtil.isBlank(who)) { - who = "World"; - } - return StrUtil.format("Hello, {}!", who); - } + /** + * Hello,World + * + * @param who 参数,非必须 + * @return Hello, ${who} + */ + @GetMapping("/hello") + public String sayHello(@RequestParam(required = false, name = "who") String who) { + if (StrUtil.isBlank(who)) { + who = "World"; + } + return StrUtil.format("Hello, {}!", who); + } } diff --git a/demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java b/demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java index d4afb6929..547e54bae 100644 --- a/demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java +++ b/demo-helloworld/src/test/java/com/xkcoding/helloworld/SpringBootDemoHelloworldApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoHelloworldApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-https/src/main/resources/static/index.html b/demo-https/src/main/resources/static/index.html index 067bc5399..933c73e98 100644 --- a/demo-https/src/main/resources/static/index.html +++ b/demo-https/src/main/resources/static/index.html @@ -1,5 +1,5 @@ - + spring boot demo https diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java b/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java index 93da11a31..ccf9a5542 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/api/Result.java @@ -54,7 +54,6 @@ private Result(int errcode, String errmsg, T data) { } - /** * 返回成功 * @@ -70,7 +69,7 @@ public static Result success() { * 返回成功-携带数据 * * @param data 响应数据 - * @param 泛型标记 + * @param 泛型标记 * @return 响应信息 {@code Result} */ public static Result success(@Nullable T data) { @@ -78,7 +77,4 @@ public static Result success(@Nullable T data) { } - - - } diff --git a/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java b/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java index 49acfeef8..ad7ebeffa 100644 --- a/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java +++ b/demo-ldap/src/main/java/com/xkcoding/ldap/entity/Person.java @@ -17,10 +17,7 @@ * @since 2019-08-26 0:51 */ @Data -@Entry( - base = "ou=people", - objectClasses = {"posixAccount", "inetOrgPerson", "top"} -) +@Entry(base = "ou=people", objectClasses = {"posixAccount", "inetOrgPerson", "top"}) public class Person implements Serializable { private static final long serialVersionUID = -7946768337975852352L; diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java index 485ce563b..32d225cd2 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoLogAopApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoLogAopApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoLogAopApplication.class, args); + } } diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java index 92d2a8d0c..487a35a57 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java @@ -26,65 +26,65 @@ @Component @Slf4j public class AopLog { - private static final String START_TIME = "request-start"; + private static final String START_TIME = "request-start"; - /** - * 切入点 - */ - @Pointcut("execution(public * com.xkcoding.log.aop.controller.*Controller.*(..))") - public void log() { + /** + * 切入点 + */ + @Pointcut("execution(public * com.xkcoding.log.aop.controller.*Controller.*(..))") + public void log() { - } + } - /** - * 前置操作 - * - * @param point 切入点 - */ - @Before("log()") - public void beforeLog(JoinPoint point) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + /** + * 前置操作 + * + * @param point 切入点 + */ + @Before("log()") + public void beforeLog(JoinPoint point) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); - log.info("【请求 URL】:{}", request.getRequestURL()); - log.info("【请求 IP】:{}", request.getRemoteAddr()); - log.info("【请求类名】:{},【请求方法名】:{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); + log.info("【请求 URL】:{}", request.getRequestURL()); + log.info("【请求 IP】:{}", request.getRemoteAddr()); + log.info("【请求类名】:{},【请求方法名】:{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); - Map parameterMap = request.getParameterMap(); - log.info("【请求参数】:{},", JSONUtil.toJsonStr(parameterMap)); - Long start = System.currentTimeMillis(); - request.setAttribute(START_TIME, start); - } + Map parameterMap = request.getParameterMap(); + log.info("【请求参数】:{},", JSONUtil.toJsonStr(parameterMap)); + Long start = System.currentTimeMillis(); + request.setAttribute(START_TIME, start); + } - /** - * 环绕操作 - * - * @param point 切入点 - * @return 原方法返回值 - * @throws Throwable 异常信息 - */ - @Around("log()") - public Object aroundLog(ProceedingJoinPoint point) throws Throwable { - Object result = point.proceed(); - log.info("【返回值】:{}", JSONUtil.toJsonStr(result)); - return result; - } + /** + * 环绕操作 + * + * @param point 切入点 + * @return 原方法返回值 + * @throws Throwable 异常信息 + */ + @Around("log()") + public Object aroundLog(ProceedingJoinPoint point) throws Throwable { + Object result = point.proceed(); + log.info("【返回值】:{}", JSONUtil.toJsonStr(result)); + return result; + } - /** - * 后置操作 - */ - @AfterReturning("log()") - public void afterReturning() { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + /** + * 后置操作 + */ + @AfterReturning("log()") + public void afterReturning() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); - Long start = (Long) request.getAttribute(START_TIME); - Long end = System.currentTimeMillis(); - log.info("【请求耗时】:{}毫秒", end - start); + Long start = (Long) request.getAttribute(START_TIME); + Long end = System.currentTimeMillis(); + log.info("【请求耗时】:{}毫秒", end - start); - String header = request.getHeader("User-Agent"); - UserAgent userAgent = UserAgent.parseUserAgentString(header); - log.info("【浏览器类型】:{},【操作系统】:{},【原始User-Agent】:{}", userAgent.getBrowser().toString(), userAgent.getOperatingSystem().toString(), header); - } + String header = request.getHeader("User-Agent"); + UserAgent userAgent = UserAgent.parseUserAgentString(header); + log.info("【浏览器类型】:{},【操作系统】:{},【原始User-Agent】:{}", userAgent.getBrowser().toString(), userAgent.getOperatingSystem().toString(), header); + } } diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java index 19292b3ff..0eda8962c 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java @@ -16,15 +16,15 @@ @RestController public class TestController { - /** - * 测试方法 - * - * @param who 测试参数 - * @return {@link Dict} - */ - @GetMapping("/test") - public Dict test(String who) { - return Dict.create().set("who", StrUtil.isBlank(who) ? "me" : who); - } + /** + * 测试方法 + * + * @param who 测试参数 + * @return {@link Dict} + */ + @GetMapping("/test") + public Dict test(String who) { + return Dict.create().set("who", StrUtil.isBlank(who) ? "me" : who); + } } diff --git a/demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java b/demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java index f2af7df5f..af44ad908 100644 --- a/demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java +++ b/demo-log-aop/src/test/java/com/xkcoding/log/aop/SpringBootDemoLogAopApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoLogAopApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java b/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java index ba2f53c3a..217ee0214 100644 --- a/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java +++ b/demo-logback/src/main/java/com/xkcoding/logback/SpringBootDemoLogbackApplication.java @@ -17,19 +17,19 @@ @Slf4j public class SpringBootDemoLogbackApplication { - public static void main(String[] args) { - ConfigurableApplicationContext context = SpringApplication.run(SpringBootDemoLogbackApplication.class, args); - int length = context.getBeanDefinitionNames().length; - log.trace("Spring boot启动初始化了 {} 个 Bean", length); - log.debug("Spring boot启动初始化了 {} 个 Bean", length); - log.info("Spring boot启动初始化了 {} 个 Bean", length); - log.warn("Spring boot启动初始化了 {} 个 Bean", length); - log.error("Spring boot启动初始化了 {} 个 Bean", length); - try { - int i = 0; - int j = 1 / i; - } catch (Exception e) { - log.error("【SpringBootDemoLogbackApplication】启动异常:", e); - } - } + public static void main(String[] args) { + ConfigurableApplicationContext context = SpringApplication.run(SpringBootDemoLogbackApplication.class, args); + int length = context.getBeanDefinitionNames().length; + log.trace("Spring boot启动初始化了 {} 个 Bean", length); + log.debug("Spring boot启动初始化了 {} 个 Bean", length); + log.info("Spring boot启动初始化了 {} 个 Bean", length); + log.warn("Spring boot启动初始化了 {} 个 Bean", length); + log.error("Spring boot启动初始化了 {} 个 Bean", length); + try { + int i = 0; + int j = 1 / i; + } catch (Exception e) { + log.error("【SpringBootDemoLogbackApplication】启动异常:", e); + } + } } diff --git a/demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java b/demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java index b387f3042..53bbb7fc4 100644 --- a/demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java +++ b/demo-logback/src/test/java/com/xkcoding/logback/SpringBootDemoLogbackApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoLogbackApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java b/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java index 1cf567d78..6617c7334 100644 --- a/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java +++ b/demo-mongodb/src/test/java/com/xkcoding/mongodb/repository/ArticleRepositoryTest.java @@ -45,8 +45,7 @@ public class ArticleRepositoryTest extends SpringBootDemoMongodbApplicationTests */ @Test public void testSave() { - Article article = new Article(1L, RandomUtil.randomString(20), RandomUtil.randomString(150), DateUtil.date(), DateUtil - .date(), 0L, 0L); + Article article = new Article(1L, RandomUtil.randomString(20), RandomUtil.randomString(150), DateUtil.date(), DateUtil.date(), 0L, 0L); articleRepo.save(article); log.info("【article】= {}", JSONUtil.toJsonStr(article)); } @@ -58,14 +57,11 @@ public void testSave() { public void testSaveList() { List
articles = Lists.newArrayList(); for (int i = 0; i < 10; i++) { - articles.add(new Article(snowflake.nextId(), RandomUtil.randomString(20), RandomUtil.randomString(150), DateUtil - .date(), DateUtil.date(), 0L, 0L)); + articles.add(new Article(snowflake.nextId(), RandomUtil.randomString(20), RandomUtil.randomString(150), DateUtil.date(), DateUtil.date(), 0L, 0L)); } articleRepo.saveAll(articles); - log.info("【articles】= {}", JSONUtil.toJsonStr(articles.stream() - .map(Article::getId) - .collect(Collectors.toList()))); + log.info("【articles】= {}", JSONUtil.toJsonStr(articles.stream().map(Article::getId).collect(Collectors.toList()))); } /** @@ -118,9 +114,7 @@ public void testThumbUp2() { update.inc("visits", 1L); mongoTemplate.updateFirst(query, update, "article"); - articleRepo.findById(1L) - .ifPresent(article -> log.info("【标题】= {}【点赞数】= {}【访客数】= {}", article.getTitle(), article.getThumbUp(), article - .getVisits())); + articleRepo.findById(1L).ifPresent(article -> log.info("【标题】= {}【点赞数】= {}【访客数】= {}", article.getTitle(), article.getThumbUp(), article.getVisits())); } /** @@ -133,10 +127,7 @@ public void testQuery() { Page
all = articleRepo.findAll(pageRequest); log.info("【总页数】= {}", all.getTotalPages()); log.info("【总条数】= {}", all.getTotalElements()); - log.info("【当前页数据】= {}", JSONUtil.toJsonStr(all.getContent() - .stream() - .map(article -> "文章标题:" + article.getTitle() + "点赞数:" + article.getThumbUp() + "更新时间:" + article.getUpdateTime()) - .collect(Collectors.toList()))); + log.info("【当前页数据】= {}", JSONUtil.toJsonStr(all.getContent().stream().map(article -> "文章标题:" + article.getTitle() + "点赞数:" + article.getThumbUp() + "更新时间:" + article.getUpdateTime()).collect(Collectors.toList()))); } /** diff --git a/demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java b/demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java index 2a69a2666..27251cc83 100644 --- a/demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java +++ b/demo-mq-rabbitmq/src/test/java/com/xkcoding/mq/rabbitmq/SpringBootDemoMqRabbitmqApplicationTests.java @@ -61,18 +61,15 @@ public void sendTopic3() { */ @Test public void sendDelay() { - rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 5s, " + DateUtil - .date()), message -> { + rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 5s, " + DateUtil.date()), message -> { message.getMessageProperties().setHeader("x-delay", 5000); return message; }); - rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 2s, " + DateUtil - .date()), message -> { + rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 2s, " + DateUtil.date()), message -> { message.getMessageProperties().setHeader("x-delay", 2000); return message; }); - rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 8s, " + DateUtil - .date()), message -> { + rabbitTemplate.convertAndSend(RabbitConsts.DELAY_MODE_QUEUE, RabbitConsts.DELAY_QUEUE, new MessageStruct("delay message, delay 8s, " + DateUtil.date()), message -> { message.getMessageProperties().setHeader("x-delay", 8000); return message; }); diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java index 6ed198ac0..39f93e62f 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/PrimaryJpaConfig.java @@ -28,12 +28,12 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories( - // repository包名 - basePackages = PrimaryJpaConfig.REPOSITORY_PACKAGE, - // 实体管理bean名称 - entityManagerFactoryRef = "primaryEntityManagerFactory", - // 事务管理bean名称 - transactionManagerRef = "primaryTransactionManager") + // repository包名 + basePackages = PrimaryJpaConfig.REPOSITORY_PACKAGE, + // 实体管理bean名称 + entityManagerFactoryRef = "primaryEntityManagerFactory", + // 事务管理bean名称 + transactionManagerRef = "primaryTransactionManager") public class PrimaryJpaConfig { static final String REPOSITORY_PACKAGE = "com.xkcoding.multi.datasource.jpa.repository.primary"; private static final String ENTITY_PACKAGE = "com.xkcoding.multi.datasource.jpa.entity.primary"; @@ -63,14 +63,14 @@ public JpaProperties jpaProperties() { @Bean(name = "primaryEntityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("primaryDataSource") DataSource primaryDataSource, @Qualifier("primaryJpaProperties") JpaProperties jpaProperties, EntityManagerFactoryBuilder builder) { return builder - // 设置数据源 - .dataSource(primaryDataSource) - // 设置jpa配置 - .properties(jpaProperties.getProperties()) - // 设置实体包名 - .packages(ENTITY_PACKAGE) - // 设置持久化单元名,用于@PersistenceContext注解获取EntityManager时指定数据源 - .persistenceUnit("primaryPersistenceUnit").build(); + // 设置数据源 + .dataSource(primaryDataSource) + // 设置jpa配置 + .properties(jpaProperties.getProperties()) + // 设置实体包名 + .packages(ENTITY_PACKAGE) + // 设置持久化单元名,用于@PersistenceContext注解获取EntityManager时指定数据源 + .persistenceUnit("primaryPersistenceUnit").build(); } /** diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java index 3228f6beb..ebbc349d7 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SecondJpaConfig.java @@ -27,12 +27,12 @@ @Configuration @EnableTransactionManagement @EnableJpaRepositories( - // repository包名 - basePackages = SecondJpaConfig.REPOSITORY_PACKAGE, - // 实体管理bean名称 - entityManagerFactoryRef = "secondEntityManagerFactory", - // 事务管理bean名称 - transactionManagerRef = "secondTransactionManager") + // repository包名 + basePackages = SecondJpaConfig.REPOSITORY_PACKAGE, + // 实体管理bean名称 + entityManagerFactoryRef = "secondEntityManagerFactory", + // 事务管理bean名称 + transactionManagerRef = "secondTransactionManager") public class SecondJpaConfig { static final String REPOSITORY_PACKAGE = "com.xkcoding.multi.datasource.jpa.repository.second"; private static final String ENTITY_PACKAGE = "com.xkcoding.multi.datasource.jpa.entity.second"; @@ -60,14 +60,14 @@ public JpaProperties jpaProperties() { @Bean(name = "secondEntityManagerFactory") public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("secondDataSource") DataSource secondDataSource, @Qualifier("secondJpaProperties") JpaProperties jpaProperties, EntityManagerFactoryBuilder builder) { return builder - // 设置数据源 - .dataSource(secondDataSource) - // 设置jpa配置 - .properties(jpaProperties.getProperties()) - // 设置实体包名 - .packages(ENTITY_PACKAGE) - // 设置持久化单元名,用于@PersistenceContext注解获取EntityManager时指定数据源 - .persistenceUnit("secondPersistenceUnit").build(); + // 设置数据源 + .dataSource(secondDataSource) + // 设置jpa配置 + .properties(jpaProperties.getProperties()) + // 设置实体包名 + .packages(ENTITY_PACKAGE) + // 设置持久化单元名,用于@PersistenceContext注解获取EntityManager时指定数据源 + .persistenceUnit("secondPersistenceUnit").build(); } /** diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java index 0b900e317..2508fb9e1 100644 --- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java +++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/config/SnowflakeConfig.java @@ -16,7 +16,7 @@ @Configuration public class SnowflakeConfig { @Bean - public Snowflake snowflake(){ - return IdUtil.createSnowflake(1,1); + public Snowflake snowflake() { + return IdUtil.createSnowflake(1, 1); } } diff --git a/demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java b/demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java index dd33ac9c7..9e6bc4d7d 100644 --- a/demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java +++ b/demo-multi-datasource-jpa/src/test/java/com/xkcoding/multi/datasource/jpa/SpringBootDemoMultiDatasourceJpaApplicationTests.java @@ -28,7 +28,7 @@ public class SpringBootDemoMultiDatasourceJpaApplicationTests { @Test public void testInsert() { - PrimaryMultiTable primary = new PrimaryMultiTable(snowflake.nextId(),"测试名称-1"); + PrimaryMultiTable primary = new PrimaryMultiTable(snowflake.nextId(), "测试名称-1"); primaryRepo.save(primary); SecondMultiTable second = new SecondMultiTable(); @@ -39,7 +39,7 @@ public void testInsert() { @Test public void testUpdate() { primaryRepo.findAll().forEach(primary -> { - primary.setName("修改后的"+primary.getName()); + primary.setName("修改后的" + primary.getName()); primaryRepo.save(primary); SecondMultiTable second = new SecondMultiTable(); diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java index 664fad10c..01c84c780 100644 --- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java +++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java @@ -90,10 +90,8 @@ public void initData() { classRepo.save(seven); // 初始化学生 - List threeClass = Lists.newArrayList(Student.of("漩涡鸣人", Lists.newArrayList(tishu, shoulijian, luoxuanwan, xianshu), seven), Student - .of("宇智波佐助", Lists.newArrayList(huanshu, zhouyin, shoulijian), seven), Student.of("春野樱", Lists.newArrayList(tishu, yiliao, shoulijian), seven)); - List sevenClass = Lists.newArrayList(Student.of("李洛克", Lists.newArrayList(tishu), three), Student.of("日向宁次", Lists - .newArrayList(tishu), three), Student.of("天天", Lists.newArrayList(tishu), three)); + List threeClass = Lists.newArrayList(Student.of("漩涡鸣人", Lists.newArrayList(tishu, shoulijian, luoxuanwan, xianshu), seven), Student.of("宇智波佐助", Lists.newArrayList(huanshu, zhouyin, shoulijian), seven), Student.of("春野樱", Lists.newArrayList(tishu, yiliao, shoulijian), seven)); + List sevenClass = Lists.newArrayList(Student.of("李洛克", Lists.newArrayList(tishu), three), Student.of("日向宁次", Lists.newArrayList(tishu), three), Student.of("天天", Lists.newArrayList(tishu), three)); studentRepo.saveAll(threeClass); studentRepo.saveAll(sevenClass); @@ -155,8 +153,7 @@ public Map> findClassmatesGroupByLesson() { List groupByLesson = studentRepo.findByClassmateGroupByLesson(); Map> result = Maps.newHashMap(); - groupByLesson.forEach(classmateInfoGroupByLesson -> result.put(classmateInfoGroupByLesson.getLessonName(), classmateInfoGroupByLesson - .getStudents())); + groupByLesson.forEach(classmateInfoGroupByLesson -> result.put(classmateInfoGroupByLesson.getLessonName(), classmateInfoGroupByLesson.getStudents())); return result; } @@ -171,11 +168,9 @@ public Map> findTeacherStudent() { List teacherStudentByLesson = studentRepo.findTeacherStudentByLesson(); Map> result = Maps.newHashMap(); - teacherStudentByClass.forEach(teacherStudent -> result.put(teacherStudent.getTeacherName(), Sets.newHashSet(teacherStudent - .getStudents()))); + teacherStudentByClass.forEach(teacherStudent -> result.put(teacherStudent.getTeacherName(), Sets.newHashSet(teacherStudent.getStudents()))); - teacherStudentByLesson.forEach(teacherStudent -> result.put(teacherStudent.getTeacherName(), Sets.newHashSet(teacherStudent - .getStudents()))); + teacherStudentByLesson.forEach(teacherStudent -> result.put(teacherStudent.getTeacherName(), Sets.newHashSet(teacherStudent.getStudents()))); return result; } diff --git a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java index f529833fd..c7cc9393b 100644 --- a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java +++ b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java @@ -71,9 +71,7 @@ public void testCountStudent() { @Test public void testFindClassmates() { Map> classmates = neoService.findClassmatesGroupByLesson(); - classmates.forEach((k, v) -> log.info("因为一起上了【{}】这门课,成为同学关系的有:{}", k, JSONUtil.toJsonStr(v.stream() - .map(Student::getName) - .collect(Collectors.toList())))); + classmates.forEach((k, v) -> log.info("因为一起上了【{}】这门课,成为同学关系的有:{}", k, JSONUtil.toJsonStr(v.stream().map(Student::getName).collect(Collectors.toList())))); } /** @@ -82,8 +80,6 @@ public void testFindClassmates() { @Test public void testFindTeacherStudent() { Map> teacherStudent = neoService.findTeacherStudent(); - teacherStudent.forEach((k, v) -> log.info("【{}】教的学生有 {}", k, JSONUtil.toJsonStr(v.stream() - .map(Student::getName) - .collect(Collectors.toList())))); + teacherStudent.forEach((k, v) -> log.info("【{}】教的学生有 {}", k, JSONUtil.toJsonStr(v.stream().map(Student::getName).collect(Collectors.toList())))); } } diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java index d9e024809..8fe249deb 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java @@ -21,11 +21,9 @@ @Component public class ClientLoginFailureHandler implements AuthenticationFailureHandler { @Override - public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, - AuthenticationException exception) throws IOException { + public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException { log.debug("Login failed!"); response.setStatus(HttpStatus.UNAUTHORIZED.value()); - response.sendRedirect("/oauth/login?error=" - + URLEncoder.encode(exception.getLocalizedMessage(), "UTF-8")); + response.sendRedirect("/oauth/login?error=" + URLEncoder.encode(exception.getLocalizedMessage(), "UTF-8")); } } diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java index 9326fb5e7..228ec8408 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java @@ -31,10 +31,7 @@ public class Oauth2AuthorizationServerConfig extends AuthorizationServerConfigur @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) { - endpoints.authenticationManager(authenticationManager) - .userDetailsService(sysUserService) - .tokenStore(tokenStore) - .accessTokenConverter(jwtAccessTokenConverter); + endpoints.authenticationManager(authenticationManager).userDetailsService(sysUserService).tokenStore(tokenStore).accessTokenConverter(jwtAccessTokenConverter); } @Override diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java index b458ffc5c..c9d253194 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java @@ -24,20 +24,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { - http - .formLogin() - .loginPage("/oauth/login") - .failureHandler(clientLoginFailureHandler) - .loginProcessingUrl("/authorization/form") - .and() - .logout() - .logoutUrl("/oauth/logout") - .logoutSuccessHandler(clientLogoutSuccessHandler) - .and() - .authorizeRequests() - .antMatchers("/oauth/**").permitAll() - .anyRequest() - .authenticated(); + http.formLogin().loginPage("/oauth/login").failureHandler(clientLoginFailureHandler).loginProcessingUrl("/authorization/form").and().logout().logoutUrl("/oauth/logout").logoutSuccessHandler(clientLogoutSuccessHandler).and().authorizeRequests().antMatchers("/oauth/**").permitAll().anyRequest().authenticated(); } /** diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java index 133f549e6..f1cc4ed5c 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java @@ -4,10 +4,10 @@ * {@link com.xkcoding.oauth.config.Oauth2AuthorizationServerConfig} * 授权服务器相关的配置,主要设置授权服务器如何读取客户端、用户信息和一些端点配置 * 可以在这里配置更多的东西,例如端点映射,token 增强等 - * + *

* {@link com.xkcoding.oauth.config.Oauth2AuthorizationTokenConfig} * 授权服务器 token 相关的配置,主要设置 jwt、加密方式等信息 - * + *

* {@link com.xkcoding.oauth.config.ClientLogoutSuccessHandler} * 资源服务器退出以后的处理。在授权码模式中,所有的客户端都需要跳转到授权服务器进行登录 * 当登录成功以后跳转到回调地址,如果用户需要登出,也要跳转到授权服务器这里进行登出 @@ -15,7 +15,6 @@ * 所以自己给登出端点加了一个 redirect_url 参数,表示登出成功以后要跳转的地址 * 这个处理器就是来完成登出成功以后的跳转操作的。 * - * * @author EchoCow * @date 2020-01-07 9:16 */ diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java index 061c1c0e1..a3938fa6e 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java @@ -36,12 +36,11 @@ public String loginView() { * 退出登录 * * @param redirectUrl 退出完成后的回调地址 - * @param principal 用户信息 + * @param principal 用户信息 * @return 结果 */ @GetMapping("/logout") - public ModelAndView logoutView( - @RequestParam("redirect_url") String redirectUrl, Principal principal) { + public ModelAndView logoutView(@RequestParam("redirect_url") String redirectUrl, Principal principal) { if (Objects.isNull(principal)) { throw new ResourceAccessException("请求错误,用户尚未登录"); } diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java index 1b58c7187..a4c53ecea 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java @@ -2,7 +2,7 @@ * 控制器。除了业务逻辑的以外,提供两个控制器来帮助完成自定义: * {@link com.xkcoding.oauth.controller.AuthorizationController} * 自定义的授权控制器,重新设置到我们的界面中去,不使用他的默认实现 - * + *

* {@link com.xkcoding.oauth.controller.Oauth2Controller} * 页面跳转的控制器,这里拿出来是因为真的可以做很多事。比如登录的时候携带点什么 * 或者退出的时候携带什么标识,都可以。 diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java index 788825912..4a049330b 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java @@ -47,9 +47,6 @@ public class SysUser { * 当前用户所有角色. */ @ManyToMany(fetch = FetchType.EAGER) - @JoinTable(name = "sys_user_role", - joinColumns = @JoinColumn(name = "user_id"), - inverseJoinColumns = @JoinColumn(name = "role_id") - ) + @JoinTable(name = "sys_user_role", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) private Set roles; } diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java index 3721373d5..7741ad607 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java @@ -5,7 +5,10 @@ import com.xkcoding.oauth.service.SysClientDetailsService; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.oauth2.provider.*; +import org.springframework.security.oauth2.provider.ClientAlreadyExistsException; +import org.springframework.security.oauth2.provider.ClientDetails; +import org.springframework.security.oauth2.provider.ClientRegistrationException; +import org.springframework.security.oauth2.provider.NoSuchClientException; import org.springframework.stereotype.Service; import java.util.List; @@ -25,14 +28,12 @@ public class SysClientDetailsServiceImpl implements SysClientDetailsService { @Override public ClientDetails loadClientByClientId(String id) throws ClientRegistrationException { - return sysClientDetailsRepository.findFirstByClientId(id) - .orElseThrow(() -> new ClientRegistrationException("Loading client exception.")); + return sysClientDetailsRepository.findFirstByClientId(id).orElseThrow(() -> new ClientRegistrationException("Loading client exception.")); } @Override public SysClientDetails findByClientId(String clientId) { - return sysClientDetailsRepository.findFirstByClientId(clientId) - .orElseThrow(() -> new ClientRegistrationException("Loading client exception.")); + return sysClientDetailsRepository.findFirstByClientId(clientId).orElseThrow(() -> new ClientRegistrationException("Loading client exception.")); } @Override @@ -46,16 +47,14 @@ public void addClientDetails(SysClientDetails clientDetails) throws ClientAlread @Override public void updateClientDetails(SysClientDetails clientDetails) throws NoSuchClientException { - SysClientDetails exist = sysClientDetailsRepository.findFirstByClientId(clientDetails.getClientId()) - .orElseThrow(() -> new NoSuchClientException("No such client!")); + SysClientDetails exist = sysClientDetailsRepository.findFirstByClientId(clientDetails.getClientId()).orElseThrow(() -> new NoSuchClientException("No such client!")); clientDetails.setClientSecret(exist.getClientSecret()); sysClientDetailsRepository.save(clientDetails); } @Override public void updateClientSecret(String clientId, String clientSecret) throws NoSuchClientException { - SysClientDetails exist = sysClientDetailsRepository.findFirstByClientId(clientId) - .orElseThrow(() -> new NoSuchClientException("No such client!")); + SysClientDetails exist = sysClientDetailsRepository.findFirstByClientId(clientId).orElseThrow(() -> new NoSuchClientException("No such client!")); exist.setClientSecret(passwordEncoder.encode(clientSecret)); sysClientDetailsRepository.save(exist); } diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java index 0f1b814c2..68068f689 100644 --- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java +++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java @@ -29,11 +29,8 @@ public class SysUserServiceImpl implements SysUserService { @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - SysUser sysUser = sysUserRepository.findFirstByUsername(username) - .orElseThrow(() -> new UsernameNotFoundException("User not found!")); - List roles = sysUser.getRoles().stream() - .map(sysRole -> new SimpleGrantedAuthority(sysRole.getName())) - .collect(Collectors.toList()); + SysUser sysUser = sysUserRepository.findFirstByUsername(username).orElseThrow(() -> new UsernameNotFoundException("User not found!")); + List roles = sysUser.getRoles().stream().map(sysRole -> new SimpleGrantedAuthority(sysRole.getName())).collect(Collectors.toList()); // 在这里手动构建 UserDetails 的默认实现 return new User(sysUser.getUsername(), sysUser.getPassword(), roles); } @@ -45,8 +42,7 @@ public List findAll() { @Override public SysUser findById(Long id) { - return sysUserRepository.findById(id) - .orElseThrow(() -> new RuntimeException("找不到用户")); + return sysUserRepository.findById(id).orElseThrow(() -> new RuntimeException("找不到用户")); } @Override diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java index ff06e8a98..0679dc550 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java @@ -46,15 +46,13 @@ void setUp() { @Test void testCannotConnectWithoutToken() { OAuth2RestTemplate template = new OAuth2RestTemplate(resource); - assertThrows(UserRedirectRequiredException.class, - () -> template.getForObject(getUrl("/oauth/me"), String.class)); + assertThrows(UserRedirectRequiredException.class, () -> template.getForObject(getUrl("/oauth/me"), String.class)); } @Test void testAttemptedTokenAcquisitionWithNoRedirect() { AuthorizationCodeAccessTokenProvider provider = new AuthorizationCodeAccessTokenProvider(); - assertThrows(UserRedirectRequiredException.class, - () -> provider.obtainAccessToken(resource, new DefaultAccessTokenRequest())); + assertThrows(UserRedirectRequiredException.class, () -> provider.obtainAccessToken(resource, new DefaultAccessTokenRequest())); } /** @@ -80,8 +78,7 @@ void testCodeAcquisitionWithCorrectContext() { form.add("_csrf", matcher.group(1)); // 3. 登录授权并获取登录成功的 cookie - ResponseEntity response = authorizationServerInfo - .postForStatus("/authorization/form", headers, form); + ResponseEntity response = authorizationServerInfo.postForStatus("/authorization/form", headers, form); assertNotNull(response); cookie = response.getHeaders().getFirst("Set-Cookie"); headers = new HttpHeaders(); @@ -89,8 +86,7 @@ void testCodeAcquisitionWithCorrectContext() { headers.setAccept(Collections.singletonList(MediaType.ALL)); // 4. 请求到 确认授权页面 ,获取确认授权页面的 _csrf 的 value - ResponseEntity confirm = authorizationServerInfo - .getForString("/oauth/authorize?response_type=code&client_id=oauth2&redirect_uri=http://example.com&scope=READ", headers); + ResponseEntity confirm = authorizationServerInfo.getForString("/oauth/authorize?response_type=code&client_id=oauth2&redirect_uri=http://example.com&scope=READ", headers); headers = confirm.getHeaders(); // 确认过一次后,后面都会自动确认了,这里判断下是不是重定向请求 diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java index de5a186bc..ff1b99e6b 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java @@ -55,8 +55,7 @@ public ResponseEntity postForStatus(String path, HttpHeaders headers, Mult HttpHeaders actualHeaders = new HttpHeaders(); actualHeaders.putAll(headers); actualHeaders.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - return client.exchange(getUrl(path), HttpMethod.POST, - new HttpEntity<>(formData, actualHeaders), (Class) null); + return client.exchange(getUrl(path), HttpMethod.POST, new HttpEntity<>(formData, actualHeaders), (Class) null); } @@ -83,8 +82,7 @@ public HttpHeaders postForHeaders(String path, MultiValueMap for } builder.deleteCharAt(builder.length() - 1); - return client.execute(builder.toString(), HttpMethod.POST, requestCallback, - HttpMessage::getHeaders); + return client.execute(builder.toString(), HttpMethod.POST, requestCallback, HttpMessage::getHeaders); } private static final class NullRequestCallback implements RequestCallback { diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java index abe19e1c0..2955a7b13 100644 --- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java +++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java @@ -8,7 +8,7 @@ import java.util.Arrays; import static com.xkcoding.oauth.oauth.AuthorizationServerInfo.getUrl; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * . diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java index fb4ac930f..b8b24b47f 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java @@ -8,8 +8,8 @@ * 启动器. * * @author EchoCow - * @date 2020-01-09 11:38 * @version V1.0 + * @date 2020-01-09 11:38 */ @EnableResourceServer @SpringBootApplication diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java index f221ce472..3985304b9 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java @@ -28,9 +28,7 @@ public class OauthResourceServerConfig extends ResourceServerConfigurerAdapter { @Override public void configure(ResourceServerSecurityConfigurer resources) { - resources - .tokenStore(tokenStore) - .resourceId(resourceServerProperties.getResourceId()); + resources.tokenStore(tokenStore).resourceId(resourceServerProperties.getResourceId()); } @Override diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java index dd5927fb2..2ddebdc71 100644 --- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java +++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java @@ -62,9 +62,7 @@ public JwtAccessTokenConverter jwtAccessTokenConverter() { */ private String getPubKey() { // 如果本地没有密钥,就从授权服务器中获取 - return StringUtils.isEmpty(resourceServerProperties.getJwt().getKeyValue()) - ? getKeyFromAuthorizationServer() - : resourceServerProperties.getJwt().getKeyValue(); + return StringUtils.isEmpty(resourceServerProperties.getJwt().getKeyValue()) ? getKeyFromAuthorizationServer() : resourceServerProperties.getJwt().getKeyValue(); } /** @@ -78,8 +76,7 @@ private String getKeyFromAuthorizationServer() { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.add(HttpHeaders.AUTHORIZATION, encodeClient()); HttpEntity requestEntity = new HttpEntity<>(null, httpHeaders); - String pubKey = new RestTemplate() - .getForObject(resourceServerProperties.getJwt().getKeyUri(), String.class, requestEntity); + String pubKey = new RestTemplate().getForObject(resourceServerProperties.getJwt().getKeyUri(), String.class, requestEntity); try { JSONObject body = objectMapper.readValue(pubKey, JSONObject.class); log.info("Get Key From Authorization Server."); @@ -96,7 +93,6 @@ private String getKeyFromAuthorizationServer() { * @return basic */ private String encodeClient() { - return "Basic " + Base64.getEncoder().encodeToString((resourceServerProperties.getClientId() - + ":" + resourceServerProperties.getClientSecret()).getBytes()); + return "Basic " + Base64.getEncoder().encodeToString((resourceServerProperties.getClientId() + ":" + resourceServerProperties.getClientSecret()).getBytes()); } } diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java index 207feb641..c830f334a 100644 --- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java +++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java @@ -32,7 +32,6 @@ protected OAuth2RestTemplate oauth2RestTemplate(String username, String password @Test void testAccessTokenWhenPassed() { - assertNotNull(oauth2RestTemplate("admin", "123456", Collections.singletonList("READ")) - .getAccessToken()); + assertNotNull(oauth2RestTemplate("admin", "123456", Collections.singletonList("READ")).getAccessToken()); } } diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java index 2e933b7ed..85090f49d 100644 --- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java +++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java @@ -32,8 +32,7 @@ void testAdminRoleSucceedAndTestRoleFailedWhenPassed() { ResponseEntity response = template.exchange(URL + "/admin", GET, null, String.class); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals("ADMIN", response.getBody()); - assertThrows(OAuth2AccessDeniedException.class, - () -> template.exchange(URL + "/test", GET, null, String.class)); + assertThrows(OAuth2AccessDeniedException.class, () -> template.exchange(URL + "/test", GET, null, String.class)); } @Test @@ -43,8 +42,7 @@ void testTestRoleSucceedWhenPassed() { ResponseEntity response = template.exchange(URL + "/test", GET, null, String.class); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals("TEST", response.getBody()); - assertThrows(OAuth2AccessDeniedException.class, - () -> template.exchange(URL + "/admin", GET, null, String.class)); + assertThrows(OAuth2AccessDeniedException.class, () -> template.exchange(URL + "/admin", GET, null, String.class)); } @Test @@ -54,8 +52,7 @@ void testScopeReadWhenPassed() { ResponseEntity response = template.exchange(URL + "/read", GET, null, String.class); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals("READ", response.getBody()); - assertThrows(OAuth2AccessDeniedException.class, - () -> template.exchange(URL + "/write", GET, null, String.class)); + assertThrows(OAuth2AccessDeniedException.class, () -> template.exchange(URL + "/write", GET, null, String.class)); } @Test @@ -65,8 +62,7 @@ void testScopeWriteWhenPassed() { ResponseEntity response = template.exchange(URL + "/write", GET, null, String.class); assertEquals(HttpStatus.OK, response.getStatusCode()); assertEquals("WRITE", response.getBody()); - assertThrows(OAuth2AccessDeniedException.class, - () -> template.exchange(URL + "/read", GET, null, String.class)); + assertThrows(OAuth2AccessDeniedException.class, () -> template.exchange(URL + "/read", GET, null, String.class)); } @Test diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java index 6ec1b5a2f..e070a7210 100644 --- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java +++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java @@ -22,7 +22,7 @@ public class BeetlConfig { * Beetl需要显示的配置数据源,方可启动项目,大坑,切记! */ @Bean(name = "datasource") - public DataSource getDataSource(Environment env){ + public DataSource getDataSource(Environment env) { HikariDataSource dataSource = new HikariDataSource(); dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name")); dataSource.setJdbcUrl(env.getProperty("spring.datasource.url")); diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java index 292f7b700..dba7b6517 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoOrmJdbctemplateApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoOrmJdbctemplateApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoOrmJdbctemplateApplication.class, args); + } } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java index bd65b9a4b..0b77cddea 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java @@ -16,10 +16,10 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Column { - /** - * 列名 - * - * @return 列名 - */ - String name(); + /** + * 列名 + * + * @return 列名 + */ + String name(); } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java index 599faa4b1..53c4cac8b 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java @@ -16,10 +16,10 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Pk { - /** - * 自增 - * - * @return 自增主键 - */ - boolean auto() default true; + /** + * 自增 + * + * @return 自增主键 + */ + boolean auto() default true; } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java index d914e2368..60528a898 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java @@ -16,10 +16,10 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) public @interface Table { - /** - * 表名 - * - * @return 表名 - */ - String name(); + /** + * 表名 + * + * @return 表名 + */ + String name(); } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java index 9b923b915..b05bedb60 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java @@ -9,13 +9,13 @@ * @date Created in 2018-10-15 10:59 */ public interface Const { - /** - * 加密盐前缀 - */ - String SALT_PREFIX = "::SpringBootDemo::"; + /** + * 加密盐前缀 + */ + String SALT_PREFIX = "::SpringBootDemo::"; - /** - * 逗号分隔符 - */ - String SEPARATOR_COMMA = ","; + /** + * 逗号分隔符 + */ + String SEPARATOR_COMMA = ","; } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java index 7c8ed7bb0..4171ce29a 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java @@ -20,40 +20,40 @@ @RestController @Slf4j public class UserController { - private final IUserService userService; - - @Autowired - public UserController(IUserService userService) { - this.userService = userService; - } - - @PostMapping("/user") - public Dict save(@RequestBody User user) { - Boolean save = userService.save(user); - return Dict.create().set("code", save ? 200 : 500).set("msg", save ? "成功" : "失败").set("data", save ? user : null); - } - - @DeleteMapping("/user/{id}") - public Dict delete(@PathVariable Long id) { - Boolean delete = userService.delete(id); - return Dict.create().set("code", delete ? 200 : 500).set("msg", delete ? "成功" : "失败"); - } - - @PutMapping("/user/{id}") - public Dict update(@RequestBody User user, @PathVariable Long id) { - Boolean update = userService.update(user, id); - return Dict.create().set("code", update ? 200 : 500).set("msg", update ? "成功" : "失败").set("data", update ? user : null); - } - - @GetMapping("/user/{id}") - public Dict getUser(@PathVariable Long id) { - User user = userService.getUser(id); - return Dict.create().set("code", 200).set("msg", "成功").set("data", user); - } - - @GetMapping("/user") - public Dict getUser(User user) { - List userList = userService.getUser(user); - return Dict.create().set("code", 200).set("msg", "成功").set("data", userList); - } + private final IUserService userService; + + @Autowired + public UserController(IUserService userService) { + this.userService = userService; + } + + @PostMapping("/user") + public Dict save(@RequestBody User user) { + Boolean save = userService.save(user); + return Dict.create().set("code", save ? 200 : 500).set("msg", save ? "成功" : "失败").set("data", save ? user : null); + } + + @DeleteMapping("/user/{id}") + public Dict delete(@PathVariable Long id) { + Boolean delete = userService.delete(id); + return Dict.create().set("code", delete ? 200 : 500).set("msg", delete ? "成功" : "失败"); + } + + @PutMapping("/user/{id}") + public Dict update(@RequestBody User user, @PathVariable Long id) { + Boolean update = userService.update(user, id); + return Dict.create().set("code", update ? 200 : 500).set("msg", update ? "成功" : "失败").set("data", update ? user : null); + } + + @GetMapping("/user/{id}") + public Dict getUser(@PathVariable Long id) { + User user = userService.getUser(id); + return Dict.create().set("code", 200).set("msg", "成功").set("data", user); + } + + @GetMapping("/user") + public Dict getUser(User user) { + List userList = userService.getUser(user); + return Dict.create().set("code", 200).set("msg", "成功").set("data", userList); + } } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java index f4e5e469e..a1b0fbf42 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java @@ -19,59 +19,59 @@ @Repository public class UserDao extends BaseDao { - @Autowired - public UserDao(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } + @Autowired + public UserDao(JdbcTemplate jdbcTemplate) { + super(jdbcTemplate); + } - /** - * 保存用户 - * - * @param user 用户对象 - * @return 操作影响行数 - */ - public Integer insert(User user) { - return super.insert(user, true); - } + /** + * 保存用户 + * + * @param user 用户对象 + * @return 操作影响行数 + */ + public Integer insert(User user) { + return super.insert(user, true); + } - /** - * 根据主键删除用户 - * - * @param id 主键id - * @return 操作影响行数 - */ - public Integer delete(Long id) { - return super.deleteById(id); - } + /** + * 根据主键删除用户 + * + * @param id 主键id + * @return 操作影响行数 + */ + public Integer delete(Long id) { + return super.deleteById(id); + } - /** - * 更新用户 - * - * @param user 用户对象 - * @param id 主键id - * @return 操作影响行数 - */ - public Integer update(User user, Long id) { - return super.updateById(user, id, true); - } + /** + * 更新用户 + * + * @param user 用户对象 + * @param id 主键id + * @return 操作影响行数 + */ + public Integer update(User user, Long id) { + return super.updateById(user, id, true); + } - /** - * 根据主键获取用户 - * - * @param id 主键id - * @return id对应的用户 - */ - public User selectById(Long id) { - return super.findOneById(id); - } + /** + * 根据主键获取用户 + * + * @param id 主键id + * @return id对应的用户 + */ + public User selectById(Long id) { + return super.findOneById(id); + } - /** - * 根据查询条件获取用户列表 - * - * @param user 用户查询条件 - * @return 用户列表 - */ - public List selectUserList(User user) { - return super.findByExample(user); - } + /** + * 根据查询条件获取用户列表 + * + * @param user 用户查询条件 + * @return 用户列表 + */ + public List selectUserList(User user) { + return super.findByExample(user); + } } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java index b0952f5fb..563e7bdaa 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java @@ -35,201 +35,201 @@ */ @Slf4j public class BaseDao { - private JdbcTemplate jdbcTemplate; - private Class clazz; - - @SuppressWarnings(value = "unchecked") - public BaseDao(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - clazz = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; - } - - /** - * 通用插入,自增列需要添加 {@link Pk} 注解 - * - * @param t 对象 - * @param ignoreNull 是否忽略 null 值 - * @return 操作的行数 - */ - protected Integer insert(T t, Boolean ignoreNull) { - String table = getTableName(t); - - List filterField = getField(t, ignoreNull); - - List columnList = getColumns(filterField); - - String columns = StrUtil.join(Const.SEPARATOR_COMMA, columnList); - - // 构造占位符 - String params = StrUtil.repeatAndJoin("?", columnList.size(), Const.SEPARATOR_COMMA); - - // 构造值 - Object[] values = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).toArray(); - - String sql = StrUtil.format("INSERT INTO {table} ({columns}) VALUES ({params})", Dict.create().set("table", table).set("columns", columns).set("params", params)); - log.debug("【执行SQL】SQL:{}", sql); - log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); - return jdbcTemplate.update(sql, values); - } - - /** - * 通用根据主键删除 - * - * @param pk 主键 - * @return 影响行数 - */ - protected Integer deleteById(P pk) { - String tableName = getTableName(); - String sql = StrUtil.format("DELETE FROM {table} where id = ?", Dict.create().set("table", tableName)); - log.debug("【执行SQL】SQL:{}", sql); - log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(pk)); - return jdbcTemplate.update(sql, pk); - } - - /** - * 通用根据主键更新,自增列需要添加 {@link Pk} 注解 - * - * @param t 对象 - * @param pk 主键 - * @param ignoreNull 是否忽略 null 值 - * @return 操作的行数 - */ - protected Integer updateById(T t, P pk, Boolean ignoreNull) { - String tableName = getTableName(t); - - List filterField = getField(t, ignoreNull); - - List columnList = getColumns(filterField); - - List columns = columnList.stream().map(s -> StrUtil.appendIfMissing(s, " = ?")).collect(Collectors.toList()); - String params = StrUtil.join(Const.SEPARATOR_COMMA, columns); - - // 构造值 - List valueList = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).collect(Collectors.toList()); - valueList.add(pk); - - Object[] values = ArrayUtil.toArray(valueList, Object.class); - - String sql = StrUtil.format("UPDATE {table} SET {params} where id = ?", Dict.create().set("table", tableName).set("params", params)); - log.debug("【执行SQL】SQL:{}", sql); - log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); - return jdbcTemplate.update(sql, values); - } - - /** - * 通用根据主键查询单条记录 - * - * @param pk 主键 - * @return 单条记录 - */ - public T findOneById(P pk) { - String tableName = getTableName(); - String sql = StrUtil.format("SELECT * FROM {table} where id = ?", Dict.create().set("table", tableName)); - RowMapper rowMapper = new BeanPropertyRowMapper<>(clazz); - log.debug("【执行SQL】SQL:{}", sql); - log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(pk)); - return jdbcTemplate.queryForObject(sql, new Object[]{pk}, rowMapper); - } - - /** - * 根据对象查询 - * - * @param t 查询条件 - * @return 对象列表 - */ - public List findByExample(T t) { - String tableName = getTableName(t); - List filterField = getField(t, true); - List columnList = getColumns(filterField); - - List columns = columnList.stream().map(s -> " and " + s + " = ? ").collect(Collectors.toList()); - - String where = StrUtil.join(" ", columns); - // 构造值 - Object[] values = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).toArray(); - - String sql = StrUtil.format("SELECT * FROM {table} where 1=1 {where}", Dict.create().set("table", tableName).set("where", StrUtil.isBlank(where) ? "" : where)); - log.debug("【执行SQL】SQL:{}", sql); - log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); - List> maps = jdbcTemplate.queryForList(sql, values); - List ret = CollUtil.newArrayList(); - maps.forEach(map -> ret.add(BeanUtil.fillBeanWithMap(map, ReflectUtil.newInstance(clazz), true, false))); - return ret; - } - - /** - * 获取表名 - * - * @param t 对象 - * @return 表名 - */ - private String getTableName(T t) { - Table tableAnnotation = t.getClass().getAnnotation(Table.class); - if (ObjectUtil.isNotNull(tableAnnotation)) { - return StrUtil.format("`{}`", tableAnnotation.name()); - } else { - return StrUtil.format("`{}`", t.getClass().getName().toLowerCase()); - } - } - - /** - * 获取表名 - * - * @return 表名 - */ - private String getTableName() { - Table tableAnnotation = clazz.getAnnotation(Table.class); - if (ObjectUtil.isNotNull(tableAnnotation)) { - return StrUtil.format("`{}`", tableAnnotation.name()); - } else { - return StrUtil.format("`{}`", clazz.getName().toLowerCase()); - } - } - - /** - * 获取列 - * - * @param fieldList 字段列表 - * @return 列信息列表 - */ - private List getColumns(List fieldList) { - // 构造列 - List columnList = CollUtil.newArrayList(); - for (Field field : fieldList) { - Column columnAnnotation = field.getAnnotation(Column.class); - String columnName; - if (ObjectUtil.isNotNull(columnAnnotation)) { - columnName = columnAnnotation.name(); - } else { - columnName = field.getName(); - } - columnList.add(StrUtil.format("`{}`", columnName)); - } - return columnList; - } - - /** - * 获取字段列表 {@code 过滤数据库中不存在的字段,以及自增列} - * - * @param t 对象 - * @param ignoreNull 是否忽略空值 - * @return 字段列表 - */ - private List getField(T t, Boolean ignoreNull) { - // 获取所有字段,包含父类中的字段 - Field[] fields = ReflectUtil.getFields(t.getClass()); - - // 过滤数据库中不存在的字段,以及自增列 - List filterField; - Stream fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) || ObjectUtil.isNull(field.getAnnotation(Pk.class))); - - // 是否过滤字段值为null的字段 - if (ignoreNull) { - filterField = fieldStream.filter(field -> ObjectUtil.isNotNull(ReflectUtil.getFieldValue(t, field))).collect(Collectors.toList()); - } else { - filterField = fieldStream.collect(Collectors.toList()); - } - return filterField; - } + private JdbcTemplate jdbcTemplate; + private Class clazz; + + @SuppressWarnings(value = "unchecked") + public BaseDao(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + clazz = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; + } + + /** + * 通用插入,自增列需要添加 {@link Pk} 注解 + * + * @param t 对象 + * @param ignoreNull 是否忽略 null 值 + * @return 操作的行数 + */ + protected Integer insert(T t, Boolean ignoreNull) { + String table = getTableName(t); + + List filterField = getField(t, ignoreNull); + + List columnList = getColumns(filterField); + + String columns = StrUtil.join(Const.SEPARATOR_COMMA, columnList); + + // 构造占位符 + String params = StrUtil.repeatAndJoin("?", columnList.size(), Const.SEPARATOR_COMMA); + + // 构造值 + Object[] values = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).toArray(); + + String sql = StrUtil.format("INSERT INTO {table} ({columns}) VALUES ({params})", Dict.create().set("table", table).set("columns", columns).set("params", params)); + log.debug("【执行SQL】SQL:{}", sql); + log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); + return jdbcTemplate.update(sql, values); + } + + /** + * 通用根据主键删除 + * + * @param pk 主键 + * @return 影响行数 + */ + protected Integer deleteById(P pk) { + String tableName = getTableName(); + String sql = StrUtil.format("DELETE FROM {table} where id = ?", Dict.create().set("table", tableName)); + log.debug("【执行SQL】SQL:{}", sql); + log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(pk)); + return jdbcTemplate.update(sql, pk); + } + + /** + * 通用根据主键更新,自增列需要添加 {@link Pk} 注解 + * + * @param t 对象 + * @param pk 主键 + * @param ignoreNull 是否忽略 null 值 + * @return 操作的行数 + */ + protected Integer updateById(T t, P pk, Boolean ignoreNull) { + String tableName = getTableName(t); + + List filterField = getField(t, ignoreNull); + + List columnList = getColumns(filterField); + + List columns = columnList.stream().map(s -> StrUtil.appendIfMissing(s, " = ?")).collect(Collectors.toList()); + String params = StrUtil.join(Const.SEPARATOR_COMMA, columns); + + // 构造值 + List valueList = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).collect(Collectors.toList()); + valueList.add(pk); + + Object[] values = ArrayUtil.toArray(valueList, Object.class); + + String sql = StrUtil.format("UPDATE {table} SET {params} where id = ?", Dict.create().set("table", tableName).set("params", params)); + log.debug("【执行SQL】SQL:{}", sql); + log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); + return jdbcTemplate.update(sql, values); + } + + /** + * 通用根据主键查询单条记录 + * + * @param pk 主键 + * @return 单条记录 + */ + public T findOneById(P pk) { + String tableName = getTableName(); + String sql = StrUtil.format("SELECT * FROM {table} where id = ?", Dict.create().set("table", tableName)); + RowMapper rowMapper = new BeanPropertyRowMapper<>(clazz); + log.debug("【执行SQL】SQL:{}", sql); + log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(pk)); + return jdbcTemplate.queryForObject(sql, new Object[]{pk}, rowMapper); + } + + /** + * 根据对象查询 + * + * @param t 查询条件 + * @return 对象列表 + */ + public List findByExample(T t) { + String tableName = getTableName(t); + List filterField = getField(t, true); + List columnList = getColumns(filterField); + + List columns = columnList.stream().map(s -> " and " + s + " = ? ").collect(Collectors.toList()); + + String where = StrUtil.join(" ", columns); + // 构造值 + Object[] values = filterField.stream().map(field -> ReflectUtil.getFieldValue(t, field)).toArray(); + + String sql = StrUtil.format("SELECT * FROM {table} where 1=1 {where}", Dict.create().set("table", tableName).set("where", StrUtil.isBlank(where) ? "" : where)); + log.debug("【执行SQL】SQL:{}", sql); + log.debug("【执行SQL】参数:{}", JSONUtil.toJsonStr(values)); + List> maps = jdbcTemplate.queryForList(sql, values); + List ret = CollUtil.newArrayList(); + maps.forEach(map -> ret.add(BeanUtil.fillBeanWithMap(map, ReflectUtil.newInstance(clazz), true, false))); + return ret; + } + + /** + * 获取表名 + * + * @param t 对象 + * @return 表名 + */ + private String getTableName(T t) { + Table tableAnnotation = t.getClass().getAnnotation(Table.class); + if (ObjectUtil.isNotNull(tableAnnotation)) { + return StrUtil.format("`{}`", tableAnnotation.name()); + } else { + return StrUtil.format("`{}`", t.getClass().getName().toLowerCase()); + } + } + + /** + * 获取表名 + * + * @return 表名 + */ + private String getTableName() { + Table tableAnnotation = clazz.getAnnotation(Table.class); + if (ObjectUtil.isNotNull(tableAnnotation)) { + return StrUtil.format("`{}`", tableAnnotation.name()); + } else { + return StrUtil.format("`{}`", clazz.getName().toLowerCase()); + } + } + + /** + * 获取列 + * + * @param fieldList 字段列表 + * @return 列信息列表 + */ + private List getColumns(List fieldList) { + // 构造列 + List columnList = CollUtil.newArrayList(); + for (Field field : fieldList) { + Column columnAnnotation = field.getAnnotation(Column.class); + String columnName; + if (ObjectUtil.isNotNull(columnAnnotation)) { + columnName = columnAnnotation.name(); + } else { + columnName = field.getName(); + } + columnList.add(StrUtil.format("`{}`", columnName)); + } + return columnList; + } + + /** + * 获取字段列表 {@code 过滤数据库中不存在的字段,以及自增列} + * + * @param t 对象 + * @param ignoreNull 是否忽略空值 + * @return 字段列表 + */ + private List getField(T t, Boolean ignoreNull) { + // 获取所有字段,包含父类中的字段 + Field[] fields = ReflectUtil.getFields(t.getClass()); + + // 过滤数据库中不存在的字段,以及自增列 + List filterField; + Stream fieldStream = CollUtil.toList(fields).stream().filter(field -> ObjectUtil.isNull(field.getAnnotation(Ignore.class)) || ObjectUtil.isNull(field.getAnnotation(Pk.class))); + + // 是否过滤字段值为null的字段 + if (ignoreNull) { + filterField = fieldStream.filter(field -> ObjectUtil.isNotNull(ReflectUtil.getFieldValue(t, field))).collect(Collectors.toList()); + } else { + filterField = fieldStream.collect(Collectors.toList()); + } + return filterField; + } } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java index 7b6ebc073..57cdb0088 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java @@ -1,7 +1,7 @@ package com.xkcoding.orm.jdbctemplate.entity; -import com.xkcoding.orm.jdbctemplate.annotation.Pk; import com.xkcoding.orm.jdbctemplate.annotation.Column; +import com.xkcoding.orm.jdbctemplate.annotation.Pk; import com.xkcoding.orm.jdbctemplate.annotation.Table; import lombok.Data; @@ -19,58 +19,58 @@ @Data @Table(name = "orm_user") public class User implements Serializable { - /** - * 主键 - */ - @Pk - private Long id; + /** + * 主键 + */ + @Pk + private Long id; - /** - * 用户名 - */ - private String name; + /** + * 用户名 + */ + private String name; - /** - * 加密后的密码 - */ - private String password; + /** + * 加密后的密码 + */ + private String password; - /** - * 加密使用的盐 - */ - private String salt; + /** + * 加密使用的盐 + */ + private String salt; - /** - * 邮箱 - */ - private String email; + /** + * 邮箱 + */ + private String email; - /** - * 手机号码 - */ - @Column(name = "phone_number") - private String phoneNumber; + /** + * 手机号码 + */ + @Column(name = "phone_number") + private String phoneNumber; - /** - * 状态,-1:逻辑删除,0:禁用,1:启用 - */ - private Integer status; + /** + * 状态,-1:逻辑删除,0:禁用,1:启用 + */ + private Integer status; - /** - * 创建时间 - */ - @Column(name = "create_time") - private Date createTime; + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; - /** - * 上次登录时间 - */ - @Column(name = "last_login_time") - private Date lastLoginTime; + /** + * 上次登录时间 + */ + @Column(name = "last_login_time") + private Date lastLoginTime; - /** - * 上次更新时间 - */ - @Column(name = "last_update_time") - private Date lastUpdateTime; + /** + * 上次更新时间 + */ + @Column(name = "last_update_time") + private Date lastUpdateTime; } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java index 099865c14..6db20510c 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java @@ -13,45 +13,45 @@ * @date Created in 2018-10-15 13:51 */ public interface IUserService { - /** - * 保存用户 - * - * @param user 用户实体 - * @return 保存成功 {@code true} 保存失败 {@code false} - */ - Boolean save(User user); - - /** - * 删除用户 - * - * @param id 主键id - * @return 删除成功 {@code true} 删除失败 {@code false} - */ - Boolean delete(Long id); - - /** - * 更新用户 - * - * @param user 用户实体 - * @param id 主键id - * @return 更新成功 {@code true} 更新失败 {@code false} - */ - Boolean update(User user, Long id); - - /** - * 获取单个用户 - * - * @param id 主键id - * @return 单个用户对象 - */ - User getUser(Long id); - - /** - * 获取用户列表 - * - * @param user 用户实体 - * @return 用户列表 - */ - List getUser(User user); + /** + * 保存用户 + * + * @param user 用户实体 + * @return 保存成功 {@code true} 保存失败 {@code false} + */ + Boolean save(User user); + + /** + * 删除用户 + * + * @param id 主键id + * @return 删除成功 {@code true} 删除失败 {@code false} + */ + Boolean delete(Long id); + + /** + * 更新用户 + * + * @param user 用户实体 + * @param id 主键id + * @return 更新成功 {@code true} 更新失败 {@code false} + */ + Boolean update(User user, Long id); + + /** + * 获取单个用户 + * + * @param id 主键id + * @return 单个用户对象 + */ + User getUser(Long id); + + /** + * 获取用户列表 + * + * @param user 用户实体 + * @return 用户列表 + */ + List getUser(User user); } diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java index 33afbc2d5..beee4fceb 100644 --- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java +++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java @@ -25,81 +25,81 @@ */ @Service public class UserServiceImpl implements IUserService { - private final UserDao userDao; + private final UserDao userDao; - @Autowired - public UserServiceImpl(UserDao userDao) { - this.userDao = userDao; - } + @Autowired + public UserServiceImpl(UserDao userDao) { + this.userDao = userDao; + } - /** - * 保存用户 - * - * @param user 用户实体 - * @return 保存成功 {@code true} 保存失败 {@code false} - */ - @Override - public Boolean save(User user) { - String rawPass = user.getPassword(); - String salt = IdUtil.simpleUUID(); - String pass = SecureUtil.md5(rawPass + Const.SALT_PREFIX + salt); - user.setPassword(pass); - user.setSalt(salt); - return userDao.insert(user) > 0; - } + /** + * 保存用户 + * + * @param user 用户实体 + * @return 保存成功 {@code true} 保存失败 {@code false} + */ + @Override + public Boolean save(User user) { + String rawPass = user.getPassword(); + String salt = IdUtil.simpleUUID(); + String pass = SecureUtil.md5(rawPass + Const.SALT_PREFIX + salt); + user.setPassword(pass); + user.setSalt(salt); + return userDao.insert(user) > 0; + } - /** - * 删除用户 - * - * @param id 主键id - * @return 删除成功 {@code true} 删除失败 {@code false} - */ - @Override - public Boolean delete(Long id) { - return userDao.delete(id) > 0; - } + /** + * 删除用户 + * + * @param id 主键id + * @return 删除成功 {@code true} 删除失败 {@code false} + */ + @Override + public Boolean delete(Long id) { + return userDao.delete(id) > 0; + } - /** - * 更新用户 - * - * @param user 用户实体 - * @param id 主键id - * @return 更新成功 {@code true} 更新失败 {@code false} - */ - @Override - public Boolean update(User user, Long id) { - User exist = getUser(id); - if (StrUtil.isNotBlank(user.getPassword())) { - String rawPass = user.getPassword(); - String salt = IdUtil.simpleUUID(); - String pass = SecureUtil.md5(rawPass + Const.SALT_PREFIX + salt); - user.setPassword(pass); - user.setSalt(salt); - } - BeanUtil.copyProperties(user, exist, CopyOptions.create().setIgnoreNullValue(true)); - exist.setLastUpdateTime(new DateTime()); - return userDao.update(exist, id) > 0; - } + /** + * 更新用户 + * + * @param user 用户实体 + * @param id 主键id + * @return 更新成功 {@code true} 更新失败 {@code false} + */ + @Override + public Boolean update(User user, Long id) { + User exist = getUser(id); + if (StrUtil.isNotBlank(user.getPassword())) { + String rawPass = user.getPassword(); + String salt = IdUtil.simpleUUID(); + String pass = SecureUtil.md5(rawPass + Const.SALT_PREFIX + salt); + user.setPassword(pass); + user.setSalt(salt); + } + BeanUtil.copyProperties(user, exist, CopyOptions.create().setIgnoreNullValue(true)); + exist.setLastUpdateTime(new DateTime()); + return userDao.update(exist, id) > 0; + } - /** - * 获取单个用户 - * - * @param id 主键id - * @return 单个用户对象 - */ - @Override - public User getUser(Long id) { - return userDao.findOneById(id); - } + /** + * 获取单个用户 + * + * @param id 主键id + * @return 单个用户对象 + */ + @Override + public User getUser(Long id) { + return userDao.findOneById(id); + } - /** - * 获取用户列表 - * - * @param user 用户实体 - * @return 用户列表 - */ - @Override - public List getUser(User user) { - return userDao.findByExample(user); - } + /** + * 获取用户列表 + * + * @param user 用户实体 + * @return 用户列表 + */ + @Override + public List getUser(User user) { + return userDao.findByExample(user); + } } diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java index 1a7c8c5f4..7592f6bee 100644 --- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java +++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoOrmJpaApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoOrmJpaApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoOrmJpaApplication.class, args); + } } diff --git a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java index 6b9204096..416763653 100644 --- a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java +++ b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java @@ -93,7 +93,7 @@ public void testUpdate() { * 测试通用Mapper - 查询单个 */ @Test - public void testQueryOne(){ + public void testQueryOne() { User user = userMapper.selectByPrimaryKey(1L); Assert.assertNotNull(user); log.debug("【user】= {}", user); diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java index 6b9a5954d..6c04aa7ad 100644 --- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java +++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java @@ -23,7 +23,7 @@ public class MybatisPlusConfig { * 性能分析拦截器,不建议生产使用 */ @Bean - public PerformanceInterceptor performanceInterceptor(){ + public PerformanceInterceptor performanceInterceptor() { return new PerformanceInterceptor(); } diff --git a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java index 9973d2d53..7a6231943 100644 --- a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java +++ b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoOrmMybatisPlusApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java index c2b1f018c..aa5fe2429 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoPropertiesApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoPropertiesApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoPropertiesApplication.class, args); + } } diff --git a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java index b676181cf..099cf1c84 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java @@ -17,17 +17,17 @@ */ @RestController public class PropertyController { - private final ApplicationProperty applicationProperty; - private final DeveloperProperty developerProperty; + private final ApplicationProperty applicationProperty; + private final DeveloperProperty developerProperty; - @Autowired - public PropertyController(ApplicationProperty applicationProperty, DeveloperProperty developerProperty) { - this.applicationProperty = applicationProperty; - this.developerProperty = developerProperty; - } + @Autowired + public PropertyController(ApplicationProperty applicationProperty, DeveloperProperty developerProperty) { + this.applicationProperty = applicationProperty; + this.developerProperty = developerProperty; + } - @GetMapping("/property") - public Dict index() { - return Dict.create().set("applicationProperty", applicationProperty).set("developerProperty", developerProperty); - } + @GetMapping("/property") + public Dict index() { + return Dict.create().set("applicationProperty", applicationProperty).set("developerProperty", developerProperty); + } } diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java index 8ccf55d67..4c73df223 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java @@ -15,8 +15,8 @@ @Data @Component public class ApplicationProperty { - @Value("${application.name}") - private String name; - @Value("${application.version}") - private String version; + @Value("${application.name}") + private String name; + @Value("${application.version}") + private String version; } diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java index a226940d5..635319e00 100644 --- a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java +++ b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java @@ -16,8 +16,8 @@ @ConfigurationProperties(prefix = "developer") @Component public class DeveloperProperty { - private String name; - private String website; - private String qq; - private String phoneNumber; + private String name; + private String website; + private String qq; + private String phoneNumber; } diff --git a/demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java b/demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java index 7a325a78f..79cdf57f3 100644 --- a/demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java +++ b/demo-properties/src/test/java/com/xkcoding/properties/SpringBootDemoPropertiesApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoPropertiesApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java index d69b3bcad..fb2aed932 100644 --- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java +++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java @@ -54,7 +54,7 @@ public Object pointcut(ProceedingJoinPoint point) throws Throwable { String key = rateLimiter.key(); // 默认用类名+方法名做限流的 key 前缀 if (StrUtil.isBlank(key)) { - key = method.getDeclaringClass().getName()+StrUtil.DOT+method.getName(); + key = method.getDeclaringClass().getName() + StrUtil.DOT + method.getName(); } // 最终限流的 key 为 前缀 + IP地址 // TODO: 此时需要考虑局域网多用户访问的情况,因此 key 后续需要加上方法参数更加合理 diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java index 24f7937b9..43062a32b 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java @@ -14,29 +14,29 @@ @EqualsAndHashCode(callSuper = true) @Data public class BaseException extends RuntimeException { - private Integer code; - private String message; - private Object data; + private Integer code; + private String message; + private Object data; - public BaseException(Status status) { - super(status.getMessage()); - this.code = status.getCode(); - this.message = status.getMessage(); - } + public BaseException(Status status) { + super(status.getMessage()); + this.code = status.getCode(); + this.message = status.getMessage(); + } - public BaseException(Status status, Object data) { - this(status); - this.data = data; - } + public BaseException(Status status, Object data) { + this(status); + this.data = data; + } - public BaseException(Integer code, String message) { - super(message); - this.code = code; - this.message = message; - } + public BaseException(Integer code, String message) { + super(message); + this.code = code; + this.message = message; + } - public BaseException(Integer code, String message, Object data) { - this(code, message); - this.data = data; - } + public BaseException(Integer code, String message, Object data) { + this(code, message); + this.data = data; + } } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java index 192ffd3ef..a9f60a783 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java @@ -110,8 +110,7 @@ public enum Status implements IStatus { public static Status fromCode(Integer code) { Status[] statuses = Status.values(); for (Status status : statuses) { - if (status.getCode() - .equals(code)) { + if (status.getCode().equals(code)) { return status; } } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java index 910496127..2b57bb67d 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java @@ -65,8 +65,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); - SecurityContextHolder.getContext() - .setAuthentication(authentication); + SecurityContextHolder.getContext().setAuthentication(authentication); filterChain.doFilter(request, response); } catch (SecurityException e) { ResponseUtil.renderJson(response, e); @@ -95,43 +94,34 @@ private boolean checkIgnores(HttpServletRequest request) { switch (httpMethod) { case GET: - ignores.addAll(customConfig.getIgnores() - .getGet()); + ignores.addAll(customConfig.getIgnores().getGet()); break; case PUT: - ignores.addAll(customConfig.getIgnores() - .getPut()); + ignores.addAll(customConfig.getIgnores().getPut()); break; case HEAD: - ignores.addAll(customConfig.getIgnores() - .getHead()); + ignores.addAll(customConfig.getIgnores().getHead()); break; case POST: - ignores.addAll(customConfig.getIgnores() - .getPost()); + ignores.addAll(customConfig.getIgnores().getPost()); break; case PATCH: - ignores.addAll(customConfig.getIgnores() - .getPatch()); + ignores.addAll(customConfig.getIgnores().getPatch()); break; case TRACE: - ignores.addAll(customConfig.getIgnores() - .getTrace()); + ignores.addAll(customConfig.getIgnores().getTrace()); break; case DELETE: - ignores.addAll(customConfig.getIgnores() - .getDelete()); + ignores.addAll(customConfig.getIgnores().getDelete()); break; case OPTIONS: - ignores.addAll(customConfig.getIgnores() - .getOptions()); + ignores.addAll(customConfig.getIgnores().getOptions()); break; default: break; } - ignores.addAll(customConfig.getIgnores() - .getPattern()); + ignores.addAll(customConfig.getIgnores().getPattern()); if (CollUtil.isNotEmpty(ignores)) { for (String ignore : ignores) { diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java index 555996dd0..ef640386a 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java @@ -58,20 +58,17 @@ public boolean hasPermission(HttpServletRequest request, Authentication authenti Long userId = principal.getId(); List roles = roleDao.selectByUserId(userId); - List roleIds = roles.stream() - .map(Role::getId) - .collect(Collectors.toList()); + List roleIds = roles.stream().map(Role::getId).collect(Collectors.toList()); List permissions = permissionDao.selectByRoleIdList(roleIds); //获取资源,前后端分离,所以过滤页面权限,只保留按钮权限 List btnPerms = permissions.stream() - // 过滤页面权限 - .filter(permission -> Objects.equals(permission.getType(), Consts.BUTTON)) - // 过滤 URL 为空 - .filter(permission -> StrUtil.isNotBlank(permission.getUrl())) - // 过滤 METHOD 为空 - .filter(permission -> StrUtil.isNotBlank(permission.getMethod())) - .collect(Collectors.toList()); + // 过滤页面权限 + .filter(permission -> Objects.equals(permission.getType(), Consts.BUTTON)) + // 过滤 URL 为空 + .filter(permission -> StrUtil.isNotBlank(permission.getUrl())) + // 过滤 METHOD 为空 + .filter(permission -> StrUtil.isNotBlank(permission.getMethod())).collect(Collectors.toList()); for (Permission btnPerm : btnPerms) { AntPathRequestMatcher antPathMatcher = new AntPathRequestMatcher(btnPerm.getUrl(), btnPerm.getMethod()); @@ -104,8 +101,7 @@ private void checkRequest(HttpServletRequest request) { // 2:new AntPathRequestMatcher(uri) 这种方式不校验请求方法,只校验请求路径 AntPathRequestMatcher antPathMatcher = new AntPathRequestMatcher(uri); if (antPathMatcher.matches(request)) { - if (!urlMapping.get(uri) - .contains(currentMethod)) { + if (!urlMapping.get(uri).contains(currentMethod)) { throw new SecurityException(Status.HTTP_BAD_METHOD); } else { return; @@ -129,15 +125,11 @@ private Multimap allUrlMapping() { handlerMethods.forEach((k, v) -> { // 获取当前 key 下的获取所有URL - Set url = k.getPatternsCondition() - .getPatterns(); + Set url = k.getPatternsCondition().getPatterns(); RequestMethodsRequestCondition method = k.getMethodsCondition(); // 为每个URL添加所有的请求方法 - url.forEach(s -> urlMapping.putAll(s, method.getMethods() - .stream() - .map(Enum::toString) - .collect(Collectors.toList()))); + url.forEach(s -> urlMapping.putAll(s, method.getMethods().stream().map(Enum::toString).collect(Collectors.toList()))); }); return urlMapping; diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java index 9e7ce1390..cadddfdf9 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java @@ -19,9 +19,6 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE") - .maxAge(MAX_AGE_SECS); + registry.addMapping("/**").allowedOrigins("*").allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE").maxAge(MAX_AGE_SECS); } } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java index acaa99147..200587fb0 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java @@ -46,10 +46,9 @@ public class AuthController { public ApiResponse login(@Valid @RequestBody LoginRequest loginRequest) { Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(loginRequest.getUsernameOrEmailOrPhone(), loginRequest.getPassword())); - SecurityContextHolder.getContext() - .setAuthentication(authentication); + SecurityContextHolder.getContext().setAuthentication(authentication); - String jwt = jwtUtil.createJWT(authentication,loginRequest.getRememberMe()); + String jwt = jwtUtil.createJWT(authentication, loginRequest.getRememberMe()); return ApiResponse.ofSuccess(new JwtResponse(jwt)); } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java index 57fcf670b..117636370 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java @@ -53,7 +53,7 @@ public ApiResponse kickoutOnlineUser(@RequestBody List names) { if (CollUtil.isEmpty(names)) { throw new SecurityException(Status.PARAM_NOT_NULL); } - if (names.contains(SecurityUtil.getCurrentUsername())){ + if (names.contains(SecurityUtil.getCurrentUsername())) { throw new SecurityException(Status.KICKOUT_SELF); } monitorService.kickout(names); diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java index 8e7d4da22..1f17f071b 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java @@ -42,14 +42,10 @@ public ApiResponse handlerException(Exception e) { return ApiResponse.ofStatus(Status.HTTP_BAD_METHOD); } else if (e instanceof MethodArgumentNotValidException) { log.error("【全局异常拦截】MethodArgumentNotValidException", e); - return ApiResponse.of(Status.BAD_REQUEST.getCode(), ((MethodArgumentNotValidException) e).getBindingResult() - .getAllErrors() - .get(0) - .getDefaultMessage(), null); + return ApiResponse.of(Status.BAD_REQUEST.getCode(), ((MethodArgumentNotValidException) e).getBindingResult().getAllErrors().get(0).getDefaultMessage(), null); } else if (e instanceof ConstraintViolationException) { log.error("【全局异常拦截】ConstraintViolationException", e); - return ApiResponse.of(Status.BAD_REQUEST.getCode(), CollUtil.getFirst(((ConstraintViolationException) e).getConstraintViolations()) - .getMessage(), null); + return ApiResponse.of(Status.BAD_REQUEST.getCode(), CollUtil.getFirst(((ConstraintViolationException) e).getConstraintViolations()).getMessage(), null); } else if (e instanceof MethodArgumentTypeMismatchException) { log.error("【全局异常拦截】MethodArgumentTypeMismatchException: 参数名 {}, 异常信息 {}", ((MethodArgumentTypeMismatchException) e).getName(), ((MethodArgumentTypeMismatchException) e).getMessage()); return ApiResponse.ofStatus(Status.PARAM_NOT_MATCH); diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java index 6b03a0510..6128c2739 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java @@ -37,12 +37,9 @@ public class CustomUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String usernameOrEmailOrPhone) throws UsernameNotFoundException { - User user = userDao.findByUsernameOrEmailOrPhone(usernameOrEmailOrPhone, usernameOrEmailOrPhone, usernameOrEmailOrPhone) - .orElseThrow(() -> new UsernameNotFoundException("未找到用户信息 : " + usernameOrEmailOrPhone)); + User user = userDao.findByUsernameOrEmailOrPhone(usernameOrEmailOrPhone, usernameOrEmailOrPhone, usernameOrEmailOrPhone).orElseThrow(() -> new UsernameNotFoundException("未找到用户信息 : " + usernameOrEmailOrPhone)); List roles = roleDao.selectByUserId(user.getId()); - List roleIds = roles.stream() - .map(Role::getId) - .collect(Collectors.toList()); + List roleIds = roles.stream().map(Role::getId).collect(Collectors.toList()); List permissions = permissionDao.selectByRoleIdList(roleIds); return UserPrincipal.create(user, roles, permissions); } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java index d2cfdfdd0..3acda1310 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java @@ -46,9 +46,7 @@ public PageResult onlineUser(PageCondition pageCondition) { Long total = keys.getTotal(); // 根据 redis 中键获取用户名列表 - List usernameList = rows.stream() - .map(s -> StrUtil.subAfter(s, Consts.REDIS_JWT_KEY_PREFIX, true)) - .collect(Collectors.toList()); + List usernameList = rows.stream().map(s -> StrUtil.subAfter(s, Consts.REDIS_JWT_KEY_PREFIX, true)).collect(Collectors.toList()); // 根据用户名查询用户信息 List userList = userDao.findByUsernameIn(usernameList); @@ -66,19 +64,16 @@ public PageResult onlineUser(PageCondition pageCondition) { */ public void kickout(List names) { // 清除 Redis 中的 JWT 信息 - List redisKeys = names.parallelStream() - .map(s -> Consts.REDIS_JWT_KEY_PREFIX + s) - .collect(Collectors.toList()); + List redisKeys = names.parallelStream().map(s -> Consts.REDIS_JWT_KEY_PREFIX + s).collect(Collectors.toList()); redisUtil.delete(redisKeys); // 获取当前用户名 String currentUsername = SecurityUtil.getCurrentUsername(); - names.parallelStream() - .forEach(name -> { - // TODO: 通知被踢出的用户已被当前登录用户踢出, - // 后期考虑使用 websocket 实现,具体伪代码实现如下。 - // String message = "您已被用户【" + currentUsername + "】手动下线!"; - log.debug("用户【{}】被用户【{}】手动下线!", name, currentUsername); - }); + names.parallelStream().forEach(name -> { + // TODO: 通知被踢出的用户已被当前登录用户踢出, + // 后期考虑使用 websocket 实现,具体伪代码实现如下。 + // String message = "您已被用户【" + currentUsername + "】手动下线!"; + log.debug("用户【{}】被用户【{}】手动下线!", name, currentUsername); + }); } } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java index 387b1c83e..1a5b366b1 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java @@ -53,13 +53,7 @@ public class JwtUtil { */ public String createJWT(Boolean rememberMe, Long id, String subject, List roles, Collection authorities) { Date now = new Date(); - JwtBuilder builder = Jwts.builder() - .setId(id.toString()) - .setSubject(subject) - .setIssuedAt(now) - .signWith(SignatureAlgorithm.HS256, jwtConfig.getKey()) - .claim("roles", roles) - .claim("authorities", authorities); + JwtBuilder builder = Jwts.builder().setId(id.toString()).setSubject(subject).setIssuedAt(now).signWith(SignatureAlgorithm.HS256, jwtConfig.getKey()).claim("roles", roles).claim("authorities", authorities); // 设置过期时间 Long ttl = rememberMe ? jwtConfig.getRemember() : jwtConfig.getTtl(); @@ -69,8 +63,7 @@ public String createJWT(Boolean rememberMe, Long id, String subject, List findKeysForPage(String patternKey, int currentPage, int pageSize) { - ScanOptions options = ScanOptions.scanOptions() - .match(patternKey) - .build(); + ScanOptions options = ScanOptions.scanOptions().match(patternKey).build(); RedisConnectionFactory factory = stringRedisTemplate.getConnectionFactory(); RedisConnection rc = factory.getConnection(); Cursor cursor = rc.scan(options); diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java index 73b1d28e0..a4e85005d 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java @@ -37,8 +37,7 @@ public static void renderJson(HttpServletResponse response, IStatus status, Obje // FIXME: hutool 的 BUG:JSONUtil.toJsonStr() // 将JSON转为String的时候,忽略null值的时候转成的String存在错误 - response.getWriter() - .write(JSONUtil.toJsonStr(new JSONObject(ApiResponse.ofStatus(status, data), false))); + response.getWriter().write(JSONUtil.toJsonStr(new JSONObject(ApiResponse.ofStatus(status, data), false))); } catch (IOException e) { log.error("Response写出JSON异常,", e); } @@ -59,8 +58,7 @@ public static void renderJson(HttpServletResponse response, BaseException except // FIXME: hutool 的 BUG:JSONUtil.toJsonStr() // 将JSON转为String的时候,忽略null值的时候转成的String存在错误 - response.getWriter() - .write(JSONUtil.toJsonStr(new JSONObject(ApiResponse.ofException(exception), false))); + response.getWriter().write(JSONUtil.toJsonStr(new JSONObject(ApiResponse.ofException(exception), false))); } catch (IOException e) { log.error("Response写出JSON异常,", e); } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java index 8b73ed176..be3fde62e 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java @@ -31,9 +31,7 @@ public static String getCurrentUsername() { * @return 当前登录用户信息,匿名登录时,为null */ public static UserPrincipal getCurrentUser() { - Object userInfo = SecurityContextHolder.getContext() - .getAuthentication() - .getPrincipal(); + Object userInfo = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); if (userInfo instanceof UserDetails) { return (UserPrincipal) userInfo; } diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java index 88ebd124b..1cf9c4122 100644 --- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java +++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java @@ -97,14 +97,9 @@ public class UserPrincipal implements UserDetails { private Collection authorities; public static UserPrincipal create(User user, List roles, List permissions) { - List roleNames = roles.stream() - .map(Role::getName) - .collect(Collectors.toList()); - - List authorities = permissions.stream() - .filter(permission -> StrUtil.isNotBlank(permission.getPermission())) - .map(permission -> new SimpleGrantedAuthority(permission.getPermission())) - .collect(Collectors.toList()); + List roleNames = roles.stream().map(Role::getName).collect(Collectors.toList()); + + List authorities = permissions.stream().filter(permission -> StrUtil.isNotBlank(permission.getPermission())).map(permission -> new SimpleGrantedAuthority(permission.getPermission())).collect(Collectors.toList()); return new UserPrincipal(user.getId(), user.getUsername(), user.getPassword(), user.getNickname(), user.getPhone(), user.getEmail(), user.getBirthday(), user.getSex(), user.getStatus(), user.getCreateTime(), user.getUpdateTime(), roleNames, authorities); } diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java index 3dab200ec..b54f98c00 100644 --- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java +++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java @@ -125,8 +125,7 @@ private User createUser(boolean isAdmin) { user.setUsername(isAdmin ? "admin" : "user"); user.setNickname(isAdmin ? "管理员" : "普通用户"); user.setPassword(encoder.encode("123456")); - user.setBirthday(DateTime.of("1994-11-22", "yyyy-MM-dd") - .getTime()); + user.setBirthday(DateTime.of("1994-11-22", "yyyy-MM-dd").getTime()); user.setEmail((isAdmin ? "admin" : "user") + "@xkcoding.com"); user.setPhone(isAdmin ? "17300000000" : "17300001111"); user.setSex(1); diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java index b0a9d3c20..6bc94ff68 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java @@ -25,19 +25,11 @@ public class Swagger2Config { @Bean public Docket createRestApi() { - return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()) - .select() - .apis(RequestHandlerSelectors.basePackage("com.xkcoding.swagger.controller")) - .paths(PathSelectors.any()) - .build(); + return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.basePackage("com.xkcoding.swagger.controller")).paths(PathSelectors.any()).build(); } private ApiInfo apiInfo() { - return new ApiInfoBuilder().title("spring-boot-demo") - .description("这是一个简单的 Swagger API 演示") - .contact(new Contact("Yangkai.Shen", "http://xkcoding.com", "237497819@qq.com")) - .version("1.0.0-SNAPSHOT") - .build(); + return new ApiInfoBuilder().title("spring-boot-demo").description("这是一个简单的 Swagger API 演示").contact(new Contact("Yangkai.Shen", "http://xkcoding.com", "237497819@qq.com")).version("1.0.0-SNAPSHOT").build(); } } diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java index bbf71a269..369f6f7df 100644 --- a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java +++ b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java @@ -32,10 +32,7 @@ public class UserController { @ApiImplicitParams({@ApiImplicitParam(name = "username", value = "用户名", dataType = DataType.STRING, paramType = ParamType.QUERY, defaultValue = "xxx")}) public ApiResponse getByUserName(String username) { log.info("多个参数用 @ApiImplicitParams"); - return ApiResponse.builder().code(200) - .message("操作成功") - .data(new User(1, username, "JAVA")) - .build(); + return ApiResponse.builder().code(200).message("操作成功").data(new User(1, username, "JAVA")).build(); } @GetMapping("/{id}") @@ -43,10 +40,7 @@ public ApiResponse getByUserName(String username) { @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "用户编号", dataType = DataType.INT, paramType = ParamType.PATH)}) public ApiResponse get(@PathVariable Integer id) { log.info("单个参数用 @ApiImplicitParam"); - return ApiResponse.builder().code(200) - .message("操作成功") - .data(new User(id, "u1", "p1")) - .build(); + return ApiResponse.builder().code(200).message("操作成功").data(new User(id, "u1", "p1")).build(); } @DeleteMapping("/{id}") diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java index f7fc8cbc6..912777727 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoTemplateBeetlApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoTemplateBeetlApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoTemplateBeetlApplication.class, args); + } } diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java index 4f6f00023..c710f7a03 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java @@ -21,18 +21,18 @@ @Slf4j public class IndexController { - @GetMapping(value = {"", "/"}) - public ModelAndView index(HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @GetMapping(value = {"", "/"}) + public ModelAndView index(HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - User user = (User) request.getSession().getAttribute("user"); - if (ObjectUtil.isNull(user)) { - mv.setViewName("redirect:/user/login"); - } else { - mv.setViewName("page/index.btl"); - mv.addObject(user); - } + User user = (User) request.getSession().getAttribute("user"); + if (ObjectUtil.isNull(user)) { + mv.setViewName("redirect:/user/login"); + } else { + mv.setViewName("page/index.btl"); + mv.addObject(user); + } - return mv; - } + return mv; + } } diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java index 272676b11..385a5f98c 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java @@ -22,19 +22,19 @@ @RequestMapping("/user") @Slf4j public class UserController { - @PostMapping("/login") - public ModelAndView login(User user, HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @PostMapping("/login") + public ModelAndView login(User user, HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - mv.addObject(user); - mv.setViewName("redirect:/"); + mv.addObject(user); + mv.setViewName("redirect:/"); - request.getSession().setAttribute("user", user); - return mv; - } + request.getSession().setAttribute("user", user); + return mv; + } - @GetMapping("/login") - public ModelAndView login() { - return new ModelAndView("page/login.btl"); - } + @GetMapping("/login") + public ModelAndView login() { + return new ModelAndView("page/login.btl"); + } } diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java index fc706edbd..d19b3618a 100644 --- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java +++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java @@ -12,6 +12,6 @@ */ @Data public class User { - private String name; - private String password; + private String name; + private String password; } diff --git a/demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java b/demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java index fa2a35fe7..4952bfd87 100644 --- a/demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java +++ b/demo-template-beetl/src/test/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoTemplateBeetlApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java index a1db5d4fd..79dc60009 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoTemplateEnjoyApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoTemplateEnjoyApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoTemplateEnjoyApplication.class, args); + } } diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java index 817cf3cb2..d7d863b33 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java @@ -15,21 +15,21 @@ */ @Configuration public class EnjoyConfig { - @Bean(name = "jfinalViewResolver") - public JFinalViewResolver getJFinalViewResolver() { - JFinalViewResolver jfr = new JFinalViewResolver(); - // setDevMode 配置放在最前面 - jfr.setDevMode(true); - // 使用 ClassPathSourceFactory 从 class path 与 jar 包中加载模板文件 - jfr.setSourceFactory(new ClassPathSourceFactory()); - // 在使用 ClassPathSourceFactory 时要使用 setBaseTemplatePath - // 代替 jfr.setPrefix("/view/") - JFinalViewResolver.engine.setBaseTemplatePath("/templates/"); + @Bean(name = "jfinalViewResolver") + public JFinalViewResolver getJFinalViewResolver() { + JFinalViewResolver jfr = new JFinalViewResolver(); + // setDevMode 配置放在最前面 + jfr.setDevMode(true); + // 使用 ClassPathSourceFactory 从 class path 与 jar 包中加载模板文件 + jfr.setSourceFactory(new ClassPathSourceFactory()); + // 在使用 ClassPathSourceFactory 时要使用 setBaseTemplatePath + // 代替 jfr.setPrefix("/view/") + JFinalViewResolver.engine.setBaseTemplatePath("/templates/"); - jfr.setSessionInView(true); - jfr.setSuffix(".html"); - jfr.setContentType("text/html;charset=UTF-8"); - jfr.setOrder(0); - return jfr; - } + jfr.setSessionInView(true); + jfr.setSuffix(".html"); + jfr.setContentType("text/html;charset=UTF-8"); + jfr.setOrder(0); + return jfr; + } } diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java index 46b9380f5..35f9df29e 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java @@ -21,18 +21,18 @@ @Slf4j public class IndexController { - @GetMapping(value = {"", "/"}) - public ModelAndView index(HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @GetMapping(value = {"", "/"}) + public ModelAndView index(HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - User user = (User) request.getSession().getAttribute("user"); - if (ObjectUtil.isNull(user)) { - mv.setViewName("redirect:/user/login"); - } else { - mv.setViewName("page/index"); - mv.addObject(user); - } + User user = (User) request.getSession().getAttribute("user"); + if (ObjectUtil.isNull(user)) { + mv.setViewName("redirect:/user/login"); + } else { + mv.setViewName("page/index"); + mv.addObject(user); + } - return mv; - } + return mv; + } } diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java index e6afad947..76d763059 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java @@ -22,19 +22,19 @@ @RequestMapping("/user") @Slf4j public class UserController { - @PostMapping("/login") - public ModelAndView login(User user, HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @PostMapping("/login") + public ModelAndView login(User user, HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - mv.addObject(user); - mv.setViewName("redirect:/"); + mv.addObject(user); + mv.setViewName("redirect:/"); - request.getSession().setAttribute("user", user); - return mv; - } + request.getSession().setAttribute("user", user); + return mv; + } - @GetMapping("/login") - public ModelAndView login() { - return new ModelAndView("page/login"); - } + @GetMapping("/login") + public ModelAndView login() { + return new ModelAndView("page/login"); + } } diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java index af7c81359..bdd989603 100644 --- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java +++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java @@ -12,6 +12,6 @@ */ @Data public class User { - private String name; - private String password; + private String name; + private String password; } diff --git a/demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java b/demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java index 476c25da4..69f9ea416 100644 --- a/demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java +++ b/demo-template-enjoy/src/test/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoTemplateEnjoyApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java index 735fce700..f2dd0fd62 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoTemplateFreemarkerApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoTemplateFreemarkerApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoTemplateFreemarkerApplication.class, args); + } } diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java index 47425353d..c315e063a 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java @@ -21,18 +21,18 @@ @Slf4j public class IndexController { - @GetMapping(value = {"", "/"}) - public ModelAndView index(HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @GetMapping(value = {"", "/"}) + public ModelAndView index(HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - User user = (User) request.getSession().getAttribute("user"); - if (ObjectUtil.isNull(user)) { - mv.setViewName("redirect:/user/login"); - } else { - mv.setViewName("page/index"); - mv.addObject(user); - } + User user = (User) request.getSession().getAttribute("user"); + if (ObjectUtil.isNull(user)) { + mv.setViewName("redirect:/user/login"); + } else { + mv.setViewName("page/index"); + mv.addObject(user); + } - return mv; - } + return mv; + } } diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java index 93b2fe7cc..b9e6f5d4e 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java @@ -22,19 +22,19 @@ @RequestMapping("/user") @Slf4j public class UserController { - @PostMapping("/login") - public ModelAndView login(User user, HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @PostMapping("/login") + public ModelAndView login(User user, HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - mv.addObject(user); - mv.setViewName("redirect:/"); + mv.addObject(user); + mv.setViewName("redirect:/"); - request.getSession().setAttribute("user", user); - return mv; - } + request.getSession().setAttribute("user", user); + return mv; + } - @GetMapping("/login") - public ModelAndView login() { - return new ModelAndView("page/login"); - } + @GetMapping("/login") + public ModelAndView login() { + return new ModelAndView("page/login"); + } } diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java index ac1e016e6..457e658d2 100644 --- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java +++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java @@ -12,6 +12,6 @@ */ @Data public class User { - private String name; - private String password; + private String name; + private String password; } diff --git a/demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java b/demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java index 5f21f9b91..d5e691d56 100644 --- a/demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java +++ b/demo-template-freemarker/src/test/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoTemplateFreemarkerApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java index b4c482f61..3a850bd34 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java @@ -14,7 +14,7 @@ @SpringBootApplication public class SpringBootDemoTemplateThymeleafApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootDemoTemplateThymeleafApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootDemoTemplateThymeleafApplication.class, args); + } } diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java index dced597a8..df6bcabd8 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java @@ -21,18 +21,18 @@ @Slf4j public class IndexController { - @GetMapping(value = {"", "/"}) - public ModelAndView index(HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @GetMapping(value = {"", "/"}) + public ModelAndView index(HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - User user = (User) request.getSession().getAttribute("user"); - if (ObjectUtil.isNull(user)) { - mv.setViewName("redirect:/user/login"); - } else { - mv.setViewName("page/index"); - mv.addObject(user); - } + User user = (User) request.getSession().getAttribute("user"); + if (ObjectUtil.isNull(user)) { + mv.setViewName("redirect:/user/login"); + } else { + mv.setViewName("page/index"); + mv.addObject(user); + } - return mv; - } + return mv; + } } diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java index aefb8e8a5..a395a5ae7 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java @@ -22,19 +22,19 @@ @RequestMapping("/user") @Slf4j public class UserController { - @PostMapping("/login") - public ModelAndView login(User user, HttpServletRequest request) { - ModelAndView mv = new ModelAndView(); + @PostMapping("/login") + public ModelAndView login(User user, HttpServletRequest request) { + ModelAndView mv = new ModelAndView(); - mv.addObject(user); - mv.setViewName("redirect:/"); + mv.addObject(user); + mv.setViewName("redirect:/"); - request.getSession().setAttribute("user", user); - return mv; - } + request.getSession().setAttribute("user", user); + return mv; + } - @GetMapping("/login") - public ModelAndView login() { - return new ModelAndView("page/login"); - } + @GetMapping("/login") + public ModelAndView login() { + return new ModelAndView("page/login"); + } } diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java index 4729104ae..cf4d5a1fe 100644 --- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java +++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java @@ -12,6 +12,6 @@ */ @Data public class User { - private String name; - private String password; + private String name; + private String password; } diff --git a/demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java b/demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java index 734e6ac0c..dd20c0c93 100644 --- a/demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java +++ b/demo-template-thymeleaf/src/test/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoTemplateThymeleafApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java index d8b4a5187..f7a835e02 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java @@ -33,68 +33,68 @@ @ConditionalOnProperty(prefix = "spring.http.multipart", name = "enabled", matchIfMissing = true) @EnableConfigurationProperties(MultipartProperties.class) public class UploadConfig { - @Value("${qiniu.accessKey}") - private String accessKey; + @Value("${qiniu.accessKey}") + private String accessKey; - @Value("${qiniu.secretKey}") - private String secretKey; + @Value("${qiniu.secretKey}") + private String secretKey; - private final MultipartProperties multipartProperties; + private final MultipartProperties multipartProperties; - @Autowired - public UploadConfig(MultipartProperties multipartProperties) { - this.multipartProperties = multipartProperties; - } + @Autowired + public UploadConfig(MultipartProperties multipartProperties) { + this.multipartProperties = multipartProperties; + } - /** - * 上传配置 - */ - @Bean - @ConditionalOnMissingBean - public MultipartConfigElement multipartConfigElement() { - return this.multipartProperties.createMultipartConfig(); - } + /** + * 上传配置 + */ + @Bean + @ConditionalOnMissingBean + public MultipartConfigElement multipartConfigElement() { + return this.multipartProperties.createMultipartConfig(); + } - /** - * 注册解析器 - */ - @Bean(name = DispatcherServlet.MULTIPART_RESOLVER_BEAN_NAME) - @ConditionalOnMissingBean(MultipartResolver.class) - public StandardServletMultipartResolver multipartResolver() { - StandardServletMultipartResolver multipartResolver = new StandardServletMultipartResolver(); - multipartResolver.setResolveLazily(this.multipartProperties.isResolveLazily()); - return multipartResolver; - } + /** + * 注册解析器 + */ + @Bean(name = DispatcherServlet.MULTIPART_RESOLVER_BEAN_NAME) + @ConditionalOnMissingBean(MultipartResolver.class) + public StandardServletMultipartResolver multipartResolver() { + StandardServletMultipartResolver multipartResolver = new StandardServletMultipartResolver(); + multipartResolver.setResolveLazily(this.multipartProperties.isResolveLazily()); + return multipartResolver; + } - /** - * 华东机房 - */ - @Bean - public com.qiniu.storage.Configuration qiniuConfig() { - return new com.qiniu.storage.Configuration(Zone.zone0()); - } + /** + * 华东机房 + */ + @Bean + public com.qiniu.storage.Configuration qiniuConfig() { + return new com.qiniu.storage.Configuration(Zone.zone0()); + } - /** - * 构建一个七牛上传工具实例 - */ - @Bean - public UploadManager uploadManager() { - return new UploadManager(qiniuConfig()); - } + /** + * 构建一个七牛上传工具实例 + */ + @Bean + public UploadManager uploadManager() { + return new UploadManager(qiniuConfig()); + } - /** - * 认证信息实例 - */ - @Bean - public Auth auth() { - return Auth.create(accessKey, secretKey); - } + /** + * 认证信息实例 + */ + @Bean + public Auth auth() { + return Auth.create(accessKey, secretKey); + } - /** - * 构建七牛空间管理实例 - */ - @Bean - public BucketManager bucketManager() { - return new BucketManager(auth(), qiniuConfig()); - } + /** + * 构建七牛空间管理实例 + */ + @Bean + public BucketManager bucketManager() { + return new BucketManager(auth(), qiniuConfig()); + } } diff --git a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java index bb0abb9ec..bf776663f 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java @@ -33,69 +33,69 @@ @Slf4j @RequestMapping("/upload") public class UploadController { - @Value("${spring.servlet.multipart.location}") - private String fileTempPath; + @Value("${spring.servlet.multipart.location}") + private String fileTempPath; - @Value("${qiniu.prefix}") - private String prefix; + @Value("${qiniu.prefix}") + private String prefix; - private final IQiNiuService qiNiuService; + private final IQiNiuService qiNiuService; - @Autowired - public UploadController(IQiNiuService qiNiuService) { - this.qiNiuService = qiNiuService; - } + @Autowired + public UploadController(IQiNiuService qiNiuService) { + this.qiNiuService = qiNiuService; + } - @PostMapping(value = "/local", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public Dict local(@RequestParam("file") MultipartFile file) { - if (file.isEmpty()) { - return Dict.create().set("code", 400).set("message", "文件内容为空"); - } - String fileName = file.getOriginalFilename(); - String rawFileName = StrUtil.subBefore(fileName, ".", true); - String fileType = StrUtil.subAfter(fileName, ".", true); - String localFilePath = StrUtil.appendIfMissing(fileTempPath, "/") + rawFileName + "-" + DateUtil.current(false) + "." + fileType; - try { - file.transferTo(new File(localFilePath)); - } catch (IOException e) { - log.error("【文件上传至本地】失败,绝对路径:{}", localFilePath); - return Dict.create().set("code", 500).set("message", "文件上传失败"); - } + @PostMapping(value = "/local", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public Dict local(@RequestParam("file") MultipartFile file) { + if (file.isEmpty()) { + return Dict.create().set("code", 400).set("message", "文件内容为空"); + } + String fileName = file.getOriginalFilename(); + String rawFileName = StrUtil.subBefore(fileName, ".", true); + String fileType = StrUtil.subAfter(fileName, ".", true); + String localFilePath = StrUtil.appendIfMissing(fileTempPath, "/") + rawFileName + "-" + DateUtil.current(false) + "." + fileType; + try { + file.transferTo(new File(localFilePath)); + } catch (IOException e) { + log.error("【文件上传至本地】失败,绝对路径:{}", localFilePath); + return Dict.create().set("code", 500).set("message", "文件上传失败"); + } - log.info("【文件上传至本地】绝对路径:{}", localFilePath); - return Dict.create().set("code", 200).set("message", "上传成功").set("data", Dict.create().set("fileName", fileName).set("filePath", localFilePath)); - } + log.info("【文件上传至本地】绝对路径:{}", localFilePath); + return Dict.create().set("code", 200).set("message", "上传成功").set("data", Dict.create().set("fileName", fileName).set("filePath", localFilePath)); + } - @PostMapping(value = "/yun", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public Dict yun(@RequestParam("file") MultipartFile file) { - if (file.isEmpty()) { - return Dict.create().set("code", 400).set("message", "文件内容为空"); - } - String fileName = file.getOriginalFilename(); - String rawFileName = StrUtil.subBefore(fileName, ".", true); - String fileType = StrUtil.subAfter(fileName, ".", true); - String localFilePath = StrUtil.appendIfMissing(fileTempPath, "/") + rawFileName + "-" + DateUtil.current(false) + "." + fileType; - try { - file.transferTo(new File(localFilePath)); - Response response = qiNiuService.uploadFile(new File(localFilePath)); - if (response.isOK()) { - JSONObject jsonObject = JSONUtil.parseObj(response.bodyString()); + @PostMapping(value = "/yun", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public Dict yun(@RequestParam("file") MultipartFile file) { + if (file.isEmpty()) { + return Dict.create().set("code", 400).set("message", "文件内容为空"); + } + String fileName = file.getOriginalFilename(); + String rawFileName = StrUtil.subBefore(fileName, ".", true); + String fileType = StrUtil.subAfter(fileName, ".", true); + String localFilePath = StrUtil.appendIfMissing(fileTempPath, "/") + rawFileName + "-" + DateUtil.current(false) + "." + fileType; + try { + file.transferTo(new File(localFilePath)); + Response response = qiNiuService.uploadFile(new File(localFilePath)); + if (response.isOK()) { + JSONObject jsonObject = JSONUtil.parseObj(response.bodyString()); - String yunFileName = jsonObject.getStr("key"); - String yunFilePath = StrUtil.appendIfMissing(prefix, "/") + yunFileName; + String yunFileName = jsonObject.getStr("key"); + String yunFilePath = StrUtil.appendIfMissing(prefix, "/") + yunFileName; - FileUtil.del(new File(localFilePath)); + FileUtil.del(new File(localFilePath)); - log.info("【文件上传至七牛云】绝对路径:{}", yunFilePath); - return Dict.create().set("code", 200).set("message", "上传成功").set("data", Dict.create().set("fileName", yunFileName).set("filePath", yunFilePath)); - } else { - log.error("【文件上传至七牛云】失败,{}", JSONUtil.toJsonStr(response)); - FileUtil.del(new File(localFilePath)); - return Dict.create().set("code", 500).set("message", "文件上传失败"); - } - } catch (IOException e) { - log.error("【文件上传至七牛云】失败,绝对路径:{}", localFilePath); - return Dict.create().set("code", 500).set("message", "文件上传失败"); - } - } + log.info("【文件上传至七牛云】绝对路径:{}", yunFilePath); + return Dict.create().set("code", 200).set("message", "上传成功").set("data", Dict.create().set("fileName", yunFileName).set("filePath", yunFilePath)); + } else { + log.error("【文件上传至七牛云】失败,{}", JSONUtil.toJsonStr(response)); + FileUtil.del(new File(localFilePath)); + return Dict.create().set("code", 500).set("message", "文件上传失败"); + } + } catch (IOException e) { + log.error("【文件上传至七牛云】失败,绝对路径:{}", localFilePath); + return Dict.create().set("code", 500).set("message", "文件上传失败"); + } + } } diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java index 0a956b39d..b0d11d45f 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java @@ -14,12 +14,12 @@ * @date Created in 2018-11-06 17:21 */ public interface IQiNiuService { - /** - * 七牛云上传文件 - * - * @param file 文件 - * @return 七牛上传Response - * @throws QiniuException 七牛异常 - */ - Response uploadFile(File file) throws QiniuException; + /** + * 七牛云上传文件 + * + * @param file 文件 + * @return 七牛上传Response + * @throws QiniuException 七牛异常 + */ + Response uploadFile(File file) throws QiniuException; } diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java index 470b0d5fd..5b08523c8 100644 --- a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java +++ b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java @@ -25,51 +25,51 @@ @Service @Slf4j public class QiNiuServiceImpl implements IQiNiuService, InitializingBean { - private final UploadManager uploadManager; + private final UploadManager uploadManager; - private final Auth auth; + private final Auth auth; - @Value("${qiniu.bucket}") - private String bucket; + @Value("${qiniu.bucket}") + private String bucket; - private StringMap putPolicy; + private StringMap putPolicy; - @Autowired - public QiNiuServiceImpl(UploadManager uploadManager, Auth auth) { - this.uploadManager = uploadManager; - this.auth = auth; - } + @Autowired + public QiNiuServiceImpl(UploadManager uploadManager, Auth auth) { + this.uploadManager = uploadManager; + this.auth = auth; + } - /** - * 七牛云上传文件 - * - * @param file 文件 - * @return 七牛上传Response - * @throws QiniuException 七牛异常 - */ - @Override - public Response uploadFile(File file) throws QiniuException { - Response response = this.uploadManager.put(file, file.getName(), getUploadToken()); - int retry = 0; - while (response.needRetry() && retry < 3) { - response = this.uploadManager.put(file, file.getName(), getUploadToken()); - retry++; - } - return response; - } + /** + * 七牛云上传文件 + * + * @param file 文件 + * @return 七牛上传Response + * @throws QiniuException 七牛异常 + */ + @Override + public Response uploadFile(File file) throws QiniuException { + Response response = this.uploadManager.put(file, file.getName(), getUploadToken()); + int retry = 0; + while (response.needRetry() && retry < 3) { + response = this.uploadManager.put(file, file.getName(), getUploadToken()); + retry++; + } + return response; + } - @Override - public void afterPropertiesSet() { - this.putPolicy = new StringMap(); - putPolicy.put("returnBody", "{\"key\":\"$(key)\",\"hash\":\"$(etag)\",\"bucket\":\"$(bucket)\",\"width\":$(imageInfo.width), \"height\":${imageInfo.height}}"); - } + @Override + public void afterPropertiesSet() { + this.putPolicy = new StringMap(); + putPolicy.put("returnBody", "{\"key\":\"$(key)\",\"hash\":\"$(etag)\",\"bucket\":\"$(bucket)\",\"width\":$(imageInfo.width), \"height\":${imageInfo.height}}"); + } - /** - * 获取上传凭证 - * - * @return 上传凭证 - */ - private String getUploadToken() { - return this.auth.uploadToken(bucket, null, 3600, putPolicy); - } + /** + * 获取上传凭证 + * + * @return 上传凭证 + */ + private String getUploadToken() { + return this.auth.uploadToken(bucket, null, 3600, putPolicy); + } } diff --git a/demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java b/demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java index bf477b6dc..44ce0e8d9 100644 --- a/demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java +++ b/demo-upload/src/test/java/com/xkcoding/upload/SpringBootDemoUploadApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoUploadApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java b/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java index 5ad505d54..300b377da 100644 --- a/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java +++ b/demo-war/src/test/java/com/xkcoding/war/SpringBootDemoWarApplicationTests.java @@ -9,8 +9,8 @@ @SpringBootTest public class SpringBootDemoWarApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java index 0fb4468e8..e7ecb2ccc 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java @@ -12,21 +12,21 @@ public interface Event { /** * 聊天事件 */ - String CHAT = "chat" ; + String CHAT = "chat"; /** * 广播消息 */ - String BROADCAST = "broadcast" ; + String BROADCAST = "broadcast"; /** * 群聊 */ - String GROUP = "group" ; + String GROUP = "group"; /** * 加入群聊 */ - String JOIN = "join" ; + String JOIN = "join"; } diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java index d89a6c3b9..9ae36b6dd 100644 --- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java +++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java @@ -104,9 +104,7 @@ public void onChatEvent(SocketIOClient client, AckRequest request, SingleMessage sendToSingle(toUser.get(), data); request.sendAckData(Dict.create().set("flag", true).set("message", "发送成功")); } else { - request.sendAckData(Dict.create() - .set("flag", false) - .set("message", "发送失败,对方不想理你(" + data.getToUid() + "不在线)")); + request.sendAckData(Dict.create().set("flag", false).set("message", "发送失败,对方不想理你(" + data.getToUid() + "不在线)")); } } diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java index 8c0876659..41c44ca04 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java @@ -24,9 +24,8 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { public void registerStompEndpoints(StompEndpointRegistry registry) { // 注册一个 /notification 端点,前端通过这个端点进行连接 registry.addEndpoint("/notification") - //解决跨域问题 - .setAllowedOrigins("*") - .withSockJS(); + //解决跨域问题 + .setAllowedOrigins("*").withSockJS(); } @Override diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java index b0b59bdb7..af953da6f 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java @@ -50,8 +50,7 @@ public void setCpuNum(int cpuNum) { } public double getTotal() { - return NumberUtil.round(NumberUtil.mul(total, 100), 2) - .doubleValue(); + return NumberUtil.round(NumberUtil.mul(total, 100), 2).doubleValue(); } public void setTotal(double total) { @@ -59,8 +58,7 @@ public void setTotal(double total) { } public double getSys() { - return NumberUtil.round(NumberUtil.mul(sys / total, 100), 2) - .doubleValue(); + return NumberUtil.round(NumberUtil.mul(sys / total, 100), 2).doubleValue(); } public void setSys(double sys) { @@ -68,8 +66,7 @@ public void setSys(double sys) { } public double getUsed() { - return NumberUtil.round(NumberUtil.mul(used / total, 100), 2) - .doubleValue(); + return NumberUtil.round(NumberUtil.mul(used / total, 100), 2).doubleValue(); } public void setUsed(double used) { @@ -77,8 +74,7 @@ public void setUsed(double used) { } public double getWait() { - return NumberUtil.round(NumberUtil.mul(wait / total, 100), 2) - .doubleValue(); + return NumberUtil.round(NumberUtil.mul(wait / total, 100), 2).doubleValue(); } public void setWait(double wait) { @@ -86,8 +82,7 @@ public void setWait(double wait) { } public double getFree() { - return NumberUtil.round(NumberUtil.mul(free / total, 100), 2) - .doubleValue(); + return NumberUtil.round(NumberUtil.mul(free / total, 100), 2).doubleValue(); } public void setFree(double free) { diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java index 3dd3dedf2..42dcae7d7 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java @@ -86,8 +86,7 @@ public double getUsage() { * 获取JDK名称 */ public String getName() { - return ManagementFactory.getRuntimeMXBean() - .getVmName(); + return ManagementFactory.getRuntimeMXBean().getVmName(); } public String getVersion() { @@ -111,8 +110,7 @@ public void setStartTime(String startTime) { } public String getStartTime() { - return DateUtil.formatDateTime(new Date(ManagementFactory.getRuntimeMXBean() - .getStartTime())); + return DateUtil.formatDateTime(new Date(ManagementFactory.getRuntimeMXBean().getStartTime())); } @@ -121,8 +119,7 @@ public void setRunTime(String runTime) { } public String getRunTime() { - long startTime = ManagementFactory.getRuntimeMXBean() - .getStartTime(); + long startTime = ManagementFactory.getRuntimeMXBean().getStartTime(); return DateUtil.formatBetween(DateUtil.current(false) - startTime); } } diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java index 4f940faed..31952cdc3 100644 --- a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java +++ b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java @@ -32,12 +32,7 @@ public static ServerVO wrapServerVO(Server server) { * @return Dict */ public static Dict wrapServerDict(ServerVO serverVO) { - Dict dict = Dict.create() - .set("cpu", serverVO.getCpu().get(0).getData()) - .set("mem", serverVO.getMem().get(0).getData()) - .set("sys", serverVO.getSys().get(0).getData()) - .set("jvm", serverVO.getJvm().get(0).getData()) - .set("sysFile", serverVO.getSysFile().get(0).getData()); + Dict dict = Dict.create().set("cpu", serverVO.getCpu().get(0).getData()).set("mem", serverVO.getMem().get(0).getData()).set("sys", serverVO.getSys().get(0).getData()).set("jvm", serverVO.getJvm().get(0).getData()).set("sysFile", serverVO.getSysFile().get(0).getData()); return dict; } } From f1655d72309eaf006013f1f7579d973a7d4b5e86 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 26 Oct 2020 23:22:59 +0800 Subject: [PATCH 07/16] =?UTF-8?q?:construction:=20ureport2=20=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E8=BF=9B=E8=A1=8C=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-ureport2/README.md | 53 +++++++++ demo-ureport2/pom.xml | 106 +++++++++++------- .../ureport2/config/InnerDatasource.java | 34 ++++++ .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 16 +++ 5 files changed, 168 insertions(+), 41 deletions(-) create mode 100644 demo-ureport2/README.md create mode 100644 demo-ureport2/src/main/java/com/xkcoding/ureport2/config/InnerDatasource.java delete mode 100644 demo-ureport2/src/main/resources/application.properties create mode 100644 demo-ureport2/src/main/resources/application.yml diff --git a/demo-ureport2/README.md b/demo-ureport2/README.md new file mode 100644 index 000000000..90a6619f6 --- /dev/null +++ b/demo-ureport2/README.md @@ -0,0 +1,53 @@ +UReport2 是一款基于架构在 Spring 之上纯 Java 的高性能报表引擎,通过迭代单元格可以实现任意复杂的中国式报表。 在 UReport2 中,提供了全新的基于网页的报表设计器,可以在 Chrome、Firefox、Edge 等各种主流浏览器运行(IE 浏览器除外)。使用 UReport2,打开浏览器即可完成各种复杂报表的设计制作 + +[https://www.w3cschool.cn/ureport](https://www.w3cschool.cn/ureport) + +## 单机使用 + +- 1. 引入 jar 依赖 + +```xml + + + com.pig4cloud.plugin + ureport-spring-boot-starter + 0.0.1 + +``` + +- application.properties 配置本地文件保存路径 + +```properties +ureport.debug=false +ureport.disableFileProvider=false +ureport.fileStoreDir=/Users/lengleng/Downloads +ureport.disableHttpSessionReportCache=true +``` +- 访问 报表设计器 + +http://127.0.0.1:8080/ureport/designer + +## 集群使用 + +如上文设计好的模板是保存在服务本机的,在集群环境中需要使用统一的文件系统存储。新增依赖 + +```xml + + + com.pig4cloud.plugin + oss-spring-boot-starter + 0.0.3 + +``` + +- 仅需配置云存储相关参数, 演示为minio + +``` +oss.access-key=lengleng +oss.secret-key=lengleng +oss.bucket-name=lengleng +oss.endpoint=http://minio.pig4cloud.com +``` + +关于 [oss-spring-boot-starter ](https://github.com/pig-mesh/oss-spring-boot-starter)使用可参考,兼容所有 S3 协议的分布式文件存储系统 +关于 [ureport-spring-boot-starter ](https://github.com/pig-mesh/ureport-spring-boot-starter)使用可参考,UReport2 的 spring boot 封装 diff --git a/demo-ureport2/pom.xml b/demo-ureport2/pom.xml index 2ed520cfc..8976d3903 100644 --- a/demo-ureport2/pom.xml +++ b/demo-ureport2/pom.xml @@ -1,48 +1,72 @@ - 4.0.0 + 4.0.0 - demo-ureport2 + demo-ureport2 + 1.0.0-SNAPSHOT + jar + + demo-ureport2 + Demo project for Spring Boot + + + com.xkcoding + spring-boot-demo 1.0.0-SNAPSHOT - jar - - demo-ureport2 - Demo project for Spring Boot - - - com.xkcoding - spring-boot-demo - 1.0.0-SNAPSHOT - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - demo-ureport2 - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + UTF-8 + UTF-8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + mysql + mysql-connector-java + + + + + com.pig4cloud.plugin + ureport-spring-boot-starter + 0.0.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.projectlombok + lombok + true + + + + + demo-ureport2 + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/demo-ureport2/src/main/java/com/xkcoding/ureport2/config/InnerDatasource.java b/demo-ureport2/src/main/java/com/xkcoding/ureport2/config/InnerDatasource.java new file mode 100644 index 000000000..6ecf0fa2e --- /dev/null +++ b/demo-ureport2/src/main/java/com/xkcoding/ureport2/config/InnerDatasource.java @@ -0,0 +1,34 @@ +package com.xkcoding.ureport2.config; + +import com.bstek.ureport.definition.datasource.BuildinDatasource; +import lombok.SneakyThrows; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.sql.Connection; + +/** + *

+ * 内部数据源 + *

+ * + * @author yangkai.shen + * @date Created in 2020-10-26 22:32 + */ +@Component +public class InnerDatasource implements BuildinDatasource { + @Autowired + private DataSource datasource; + + @Override + public String name() { + return "内部数据源"; + } + + @SneakyThrows + @Override + public Connection getConnection() { + return datasource.getConnection(); + } +} diff --git a/demo-ureport2/src/main/resources/application.properties b/demo-ureport2/src/main/resources/application.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/demo-ureport2/src/main/resources/application.yml b/demo-ureport2/src/main/resources/application.yml new file mode 100644 index 000000000..811024fdc --- /dev/null +++ b/demo-ureport2/src/main/resources/application.yml @@ -0,0 +1,16 @@ +server: + port: 8080 + servlet: + context-path: /demo +spring: + datasource: + url: jdbc:mysql://127.0.0.1:3306/spring-boot-demo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8 + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver +ureport: + debug: false + disableFileProvider: false + disableHttpSessionReportCache: true + # 单机模式,路径需要提前创建 + fileStoreDir: '/Users/yangkai.shen/Desktop/ureport2' From 0fcc86facd6a68f7119265c95194c6531386219e Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Mon, 26 Oct 2020 23:49:23 +0800 Subject: [PATCH 08/16] =?UTF-8?q?:construction:=20ureport2=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=81=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-ureport2/doc/sql/t_user_ureport2.sql | 51 +++++++++++++++++++ .../user_inner_datasource.ureport.xml | 9 ++++ 2 files changed, 60 insertions(+) create mode 100644 demo-ureport2/doc/sql/t_user_ureport2.sql create mode 100644 demo-ureport2/doc/ureport2/user_inner_datasource.ureport.xml diff --git a/demo-ureport2/doc/sql/t_user_ureport2.sql b/demo-ureport2/doc/sql/t_user_ureport2.sql new file mode 100644 index 000000000..f328f7762 --- /dev/null +++ b/demo-ureport2/doc/sql/t_user_ureport2.sql @@ -0,0 +1,51 @@ +/* + Navicat Premium Data Transfer + + Source Server : dev + Source Server Type : MySQL + Source Server Version : 50732 + Source Host : localhost:3306 + Source Schema : spring-boot-demo + + Target Server Type : MySQL + Target Server Version : 50732 + File Encoding : 65001 + + Date: 26/10/2020 23:30:27 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for t_user_ureport2 +-- ---------------------------- +DROP TABLE IF EXISTS `t_user_ureport2`; +CREATE TABLE `t_user_ureport2` ( + `id` bigint(13) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(255) COLLATE utf8mb4_bin NOT NULL COMMENT '姓名', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `status` tinyint(4) NOT NULL COMMENT '是否禁用', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +-- ---------------------------- +-- Records of t_user_ureport2 +-- ---------------------------- +BEGIN; +INSERT INTO `t_user_ureport2` VALUES (1, '测试人员 1', '2020-10-22 09:01:58', 1); +INSERT INTO `t_user_ureport2` VALUES (2, '测试人员 2', '2020-10-22 09:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (3, '测试人员 3', '2020-10-23 03:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (4, '测试人员 4', '2020-10-23 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (5, '测试人员 5', '2020-10-23 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (6, '测试人员 6', '2020-10-24 11:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (7, '测试人员 7', '2020-10-24 20:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (8, '测试人员 8', '2020-10-25 08:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (9, '测试人员 9', '2020-10-25 09:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (10, '测试人员 10', '2020-10-25 13:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (11, '测试人员 11', '2020-10-26 21:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (12, '测试人员 12', '2020-10-26 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (13, '测试人员 13', '2020-10-26 23:02:00', 1); +COMMIT; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/demo-ureport2/doc/ureport2/user_inner_datasource.ureport.xml b/demo-ureport2/doc/ureport2/user_inner_datasource.ureport.xml new file mode 100644 index 000000000..4fabe07f6 --- /dev/null +++ b/demo-ureport2/doc/ureport2/user_inner_datasource.ureport.xml @@ -0,0 +1,9 @@ + \ No newline at end of file From ceef4844daa621639d13ec792138610a707360c2 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 27 Oct 2020 18:00:19 +0800 Subject: [PATCH 09/16] =?UTF-8?q?:memo:=20=E6=B7=BB=E5=8A=A0=E6=8B=9B?= =?UTF-8?q?=E8=81=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++ jd.md | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 jd.md diff --git a/README.md b/README.md index b44b5e947..5f7c08c99 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,10 @@ ## 其他 +### 团队纳新 + +组内招人啦,HC 巨多,Base 杭州,感兴趣的小伙伴,查看 [岗位详情](./jd.md) + ### 开源推荐 - `JustAuth`:史上最全的整合第三方登录的开源库,https://github.com/justauth/JustAuth diff --git a/jd.md b/jd.md new file mode 100644 index 000000000..86eab02e3 --- /dev/null +++ b/jd.md @@ -0,0 +1,127 @@ +> 公司:杭州涂鸦信息科技有限公司,是一个全球云开发平台、AI+IoT开发者平台,连接消费者、制造品牌、OEM厂商和连锁零售商的智能化需求,为开发者提供一站式人工智能物联网的PaaS级解决方案。并且涵盖了硬件开发工具、全球云、智慧商业平台开发三方面,提供从技术到营销渠道的全面生态赋能,打造世界领先的IoT OS。 +> +> 团队:云端开发部/数据平台 +> +> Base:杭州 + +组内招人啦,HC 巨多 ~~ 感兴趣的小伙伴,简历发过来,:kissing_heart: + +> 微信:syk941020 +> +> 邮箱:237497819@qq.com +> +> 备注:内推+岗位 + +--- + +# 岗位列表 + +[TOC] + +## 高级java开发-大数据方向 + +### 【职位描述】 + +1. 精通Java开源框架,Java开发语言 +3. 对新技术有出色的学习能力,掌握 mybatis, Spring MVC等技术 +3. 参与公司大数据产品、核心架构的研发和方向预演; +4. 思维开阔喜问乐学,以提升自己的能力和效率; + +### 【职位要求】 + +1. 精通Java语言,对相关技术领域的开源产品有深入的理解; +2. 希望你有3年以上java相关经验; +3. 熟悉Linux下的常用系统工具, 能利用工具排查CPU, 内存, IO等系统问题; +4. 从事过大规模 Web 应用开发,熟悉代码重构,性能优化,系统安全和高可用性; +5. 熟悉非关系型数据库如Redis、Hbase等。 +6. 有过hbase,elasticsearch,flink,tidb,clickhouse的开发经验,对这5者有一个深入研究者优先。 +7. 有过数据应用产品相关开发经验优先。 + +## 高级java大数据平台开发工程师 + +### 【职位描述】 + +1. 负责大数据平台的设计与开发实现 +2. 负责大数据应用相关产品需求分析、架构设计以及开发实现 +3. 负责数据产品的服务接口开发和维护 + +### 【职位要求】 + +1. 本科及以上学历,2年及以上大数据相关技术背景 +2. 熟练进行Java的代码编写,良好的代码编写素养,良好的数据结构算法技能。 +3. 熟悉spring boot、mybatis、dubbo等开发框架,熟悉前后端分离开发流程 +4. 有大数据平台开发经验,包括但不限于离线开发平台、数据质量中心、元数据管理、数据资产管理,实时流平台,可视化报表等 +5. 熟悉开源大数据平台如HBase、ES、Kylin、tidb、clickhouse等相关技术 +6. 有过使用flink做实时计算平台成功案例者和用过hera系统做过离线任务平台者优先。 + +## 大数据开发工程师(flink方向) + +### 【岗位职责】 + +1. 负责业务数据和用户行为日志的实时采集、计算、存储、服务,为业务团队提供直接数据决策; +2. 负责部门实时计算体系架构建设及实时计算平台开发改进。 +3. 负责即时分析相关技术方案的探索 +4. 负责实时数据仓库的建设,完善实时计算方案 + +### 【任职要求】 + +1. 深入了解离线计算及相关开发,掌握实时计算技术体系包括数据采集、计算引擎flink等,对实时计算所涉及的事务、容错、可靠性有深入理解 并有实际项目经验; +2. 熟悉 hadoop 生态包括 hdfs/mapreduce/hive/hbase,熟悉 kafka 等实时开源工具并有项目经验; +3. 熟悉 mysql 等关系型数据库,熟悉 redis 内存数据库,熟悉 linux 系统; +4. 掌握Java或Scala语言,如并发编程和JVM等,追求高标准的工程质量; +5. 有flink实时计算开发经验,熟悉olap的相关技术。 +6. 有良好的沟通能力和自我驱动动力,具备出色的规划、执行力,强烈的责任感,以及优秀的学习能力,对技术有热情,愿意不断尝试新技术和业务挑战。 + +## 高级数据仓库开发工程师 + +### 【岗位描述】 + +1. 负责数据仓库架构设计、建模和ETL开发; +2. 参与数据治理工作,提升数据易用性及数据质量; +3. 理解并合理抽象业务需求,发挥数据价值,与业务、BI团队紧密合作。 + +### 【技能要求】 + +1. 有数据仓库需求调研和需求分析经验,能根据业务需求设计数据仓库模型,并对数据仓库数据模型进行管理,保证数据质量。 +2. 精通sql开发,有较丰富的spark sql性能调优经验优先; +3. 精通数据仓库实施方法论、深入了解数据仓库体系,并支撑过实际业务场景; +4. 熟悉数据治理的相关环节、有相关开发经验或者实际应用场景; +5. 具备较强的编码能力,熟悉sql,python,hive,spark,kafka,storm中的多项; +6. 对数据敏感,认真细致,善于从数据中发现疑点; +7. 善于沟通,具备优秀的技术与业务结合能力。 + +## bi分析师 + +### 【岗位职责】 + +1. 为公司技术,运营,产品,业务策略等提供数据支持; +2. 维护,完善数据报表体系,及时,准确监控运营状况,并提供专业分析报告; +3. 通过数据来发现业务、流程中的问题、机会,从数据角度为业务部门提出相应的优化建议,并与多方合作实现流程改善,推动相关业务目标达成; +4. 沉淀分析思路与框架,提炼数据产品需求,与相关团队协作并推动数据产品的落地; + +### 【任职要求】 + +1. 本科以上学历,2年以上工作经验,有过互联网数据分析经验者优先; +2. 扎实的数据分析、数据统计理论,善于对抽象问题进行概括; +3. 精通Excel,熟练SQL查询等操作,熟练使用至少一种数据分析工具(R、Python、SPSS等)者优先; +4. 具有良好的学习能力、沟通表达能力和团队协作能力。 + +## 大数据平台架构师 + +### 【职位描述】 + +1. 负责涂鸦大数据平台的开发建设,建立数据生态服务,解决海量数据面临的挑战 +2. 参与大数据平台各类基础系统架构设计和引擎开发,集群优化,技术难点攻关 +3. 集群数据安全相关体系建设,各种存储,查询方案构建 +4. 协助管理、优化并维护Hadoop、Spark、flink等集群,保证集群规模持续、稳定; +5. 负责大数据产品的自动化、离线与实时计算、即席计算、数据质量、数据安全等平台的设计和开发; +6. 调研和把握当前的最新技术,将其中的先进技术引入到自己的平台中,改善产品,提升竞争力 + +### 【职位要求】 + +1. 本科及以上学历,5年以上工作经验,3年以上大数据领域工作经验,熟悉java,spark +2. 熟悉开源大数据平台如HBase、ES、Kylin、Druid等,有实际的报表平台、多维度分析工具、etl平台、调度平台、实时平台中至少两种工具的实际建设经验。 +3. 有上述相关系统为基础的实际成功的复杂系统项目的架构和开发经验 +4. 热爱开源技术,熟悉一种或者多种大数据生态技术(Kafka、Hive、Hbase、Spark、Storm、Hadoop、Flink、kudu、clickhouse、tidb等),熟悉源码者优先 +5. 相关开源领域的活跃贡献者或大型互联网公司相关从业经验者优先. +6. 有过使用flink做实时计算平台成功案例者和用过hera系统做过离线任务平台者优先。 From 3547f84d046b105e5b034aab9c64eb4e437edcb2 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 27 Oct 2020 18:08:47 +0800 Subject: [PATCH 10/16] =?UTF-8?q?:memo:=20=E6=B7=BB=E5=8A=A0=E6=8B=9B?= =?UTF-8?q?=E8=81=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jd.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/jd.md b/jd.md index 86eab02e3..ed165299f 100644 --- a/jd.md +++ b/jd.md @@ -16,7 +16,25 @@ # 岗位列表 -[TOC] +* [岗位列表](#岗位列表) + * [高级java开发-大数据方向](#高级java开发-大数据方向) + * [【职位描述】](#职位描述) + * [【职位要求】](#职位要求) + * [高级java大数据平台开发工程师](#高级java大数据平台开发工程师) + * [【职位描述】](#职位描述-1) + * [【职位要求】](#职位要求-1) + * [大数据开发工程师(flink方向)](#大数据开发工程师flink方向) + * [【岗位职责】](#岗位职责) + * [【任职要求】](#任职要求) + * [高级数据仓库开发工程师](#高级数据仓库开发工程师) + * [【岗位描述】](#岗位描述) + * [【技能要求】](#技能要求) + * [bi分析师](#bi分析师) + * [【岗位职责】](#岗位职责-1) + * [【任职要求】](#任职要求-1) + * [大数据平台架构师](#大数据平台架构师) + * [【职位描述】](#职位描述-2) + * [【职位要求】](#职位要求-2) ## 高级java开发-大数据方向 From 30017fa381db25499f9700792df9898ed4934ad1 Mon Sep 17 00:00:00 2001 From: chenqi <1535985458@qq.com> Date: Mon, 16 Nov 2020 20:27:06 +0800 Subject: [PATCH 11/16] =?UTF-8?q?feat:=20aop=E5=88=87=E9=9D=A2=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=B0=E5=A2=9Ejson=E5=8F=82=E6=95=B0=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=92=8C=E9=AB=98=E5=B9=B6=E5=8F=91=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 打印json类型的参数以及参数名和参数值 2. 高并发场景多线程情况下, 将日志封装到对象中一起打印 --- demo-log-aop/pom.xml | 6 + .../com/xkcoding/log/aop/aspectj/AopLog.java | 162 ++++++++++++++---- .../log/aop/controller/TestController.java | 20 +++ 3 files changed, 151 insertions(+), 37 deletions(-) diff --git a/demo-log-aop/pom.xml b/demo-log-aop/pom.xml index 7113002aa..a01664fbf 100644 --- a/demo-log-aop/pom.xml +++ b/demo-log-aop/pom.xml @@ -23,6 +23,12 @@ + + + com.google.guava + guava + + org.springframework.boot spring-boot-starter-web diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java index 487a35a57..d39c093de 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/aspectj/AopLog.java @@ -1,16 +1,28 @@ package com.xkcoding.log.aop.aspectj; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.json.JSONUtil; +import com.google.common.collect.Maps; import eu.bitwalker.useragentutils.UserAgent; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.*; +import org.aspectj.lang.Signature; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Collections; import java.util.Map; import java.util.Objects; @@ -20,14 +32,13 @@ *

* * @author yangkai.shen + * @author chen qi * @date Created in 2018-10-01 22:05 */ @Aspect @Component @Slf4j public class AopLog { - private static final String START_TIME = "request-start"; - /** * 切入点 */ @@ -36,27 +47,6 @@ public void log() { } - /** - * 前置操作 - * - * @param point 切入点 - */ - @Before("log()") - public void beforeLog(JoinPoint point) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); - - log.info("【请求 URL】:{}", request.getRequestURL()); - log.info("【请求 IP】:{}", request.getRemoteAddr()); - log.info("【请求类名】:{},【请求方法名】:{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); - - Map parameterMap = request.getParameterMap(); - log.info("【请求参数】:{},", JSONUtil.toJsonStr(parameterMap)); - Long start = System.currentTimeMillis(); - request.setAttribute(START_TIME, start); - } - /** * 环绕操作 * @@ -66,25 +56,123 @@ public void beforeLog(JoinPoint point) { */ @Around("log()") public Object aroundLog(ProceedingJoinPoint point) throws Throwable { + + // 开始打印请求日志 + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + + // 打印请求相关参数 + long startTime = System.currentTimeMillis(); Object result = point.proceed(); - log.info("【返回值】:{}", JSONUtil.toJsonStr(result)); + String header = request.getHeader("User-Agent"); + UserAgent userAgent = UserAgent.parseUserAgentString(header); + + final Log l = Log.builder() + .threadId(Long.toString(Thread.currentThread().getId())) + .threadName(Thread.currentThread().getName()) + .ip(getIp(request)) + .url(request.getRequestURL().toString()) + .classMethod(String.format("%s.%s", point.getSignature().getDeclaringTypeName(), + point.getSignature().getName())) + .httpMethod(request.getMethod()) + .requestParams(getNameAndValue(point)) + .result(result) + .timeCost(System.currentTimeMillis() - startTime) + .userAgent(header) + .browser(userAgent.getBrowser().toString()) + .os(userAgent.getOperatingSystem().toString()).build(); + + log.info("Request Log Info : {}", JSONUtil.toJsonStr(l)); + return result; } /** - * 后置操作 + * 获取方法参数名和参数值 + * @param joinPoint + * @return */ - @AfterReturning("log()") - public void afterReturning() { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + private Map getNameAndValue(ProceedingJoinPoint joinPoint) { - Long start = (Long) request.getAttribute(START_TIME); - Long end = System.currentTimeMillis(); - log.info("【请求耗时】:{}毫秒", end - start); + final Signature signature = joinPoint.getSignature(); + MethodSignature methodSignature = (MethodSignature) signature; + final String[] names = methodSignature.getParameterNames(); + final Object[] args = joinPoint.getArgs(); - String header = request.getHeader("User-Agent"); - UserAgent userAgent = UserAgent.parseUserAgentString(header); - log.info("【浏览器类型】:{},【操作系统】:{},【原始User-Agent】:{}", userAgent.getBrowser().toString(), userAgent.getOperatingSystem().toString(), header); + if (ArrayUtil.isEmpty(names) || ArrayUtil.isEmpty(args)) { + return Collections.emptyMap(); + } + if (names.length != args.length) { + log.warn("{}方法参数名和参数值数量不一致", methodSignature.getName()); + return Collections.emptyMap(); + } + Map map = Maps.newHashMap(); + for (int i = 0; i < names.length; i++) { + map.put(names[i], args[i]); + } + return map; + } + + private static final String UNKNOWN = "unknown"; + + /** + * 获取ip地址 + */ + public static String getIp(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + String comma = ","; + String localhost = "127.0.0.1"; + if (ip.contains(comma)) { + ip = ip.split(",")[0]; + } + if (localhost.equals(ip)) { + // 获取本机真正的ip地址 + try { + ip = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + log.error(e.getMessage(), e); + } + } + return ip; + } + + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + static class Log { + // 线程id + private String threadId; + // 线程名称 + private String threadName; + // ip + private String ip; + // url + private String url; + // http方法 GET POST PUT DELETE PATCH + private String httpMethod; + // 类方法 + private String classMethod; + // 请求参数 + private Object requestParams; + // 返回参数 + private Object result; + // 接口耗时 + private Long timeCost; + // 操作系统 + private String os; + // 浏览器 + private String browser; + // user-agent + private String userAgent; } } diff --git a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java index 0eda8962c..c261d7917 100644 --- a/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java +++ b/demo-log-aop/src/main/java/com/xkcoding/log/aop/controller/TestController.java @@ -2,17 +2,25 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** *

* 测试 Controller *

* * @author yangkai.shen + * @author chen qi * @date Created in 2018-10-01 22:10 */ +@Slf4j @RestController public class TestController { @@ -27,4 +35,16 @@ public Dict test(String who) { return Dict.create().set("who", StrUtil.isBlank(who) ? "me" : who); } + /** + * 测试post json方法 + * @param map 请求的json参数 + * @return {@link Dict} + */ + @PostMapping("/testJson") + public Dict testJson(@RequestBody Map map) { + + final String jsonStr = JSONUtil.toJsonStr(map); + log.info(jsonStr); + return Dict.create().set("json", map); + } } From d8935e6969c1d7886f0bcf9f082058d21f5d5754 Mon Sep 17 00:00:00 2001 From: chenqi <1535985458@qq.com> Date: Tue, 17 Nov 2020 10:13:33 +0800 Subject: [PATCH 12/16] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9log-aop?= =?UTF-8?q?=E7=9A=84README.md=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-log-aop/README.md | 239 ++++++++++++++++++++++++++++------------- 1 file changed, 167 insertions(+), 72 deletions(-) diff --git a/demo-log-aop/README.md b/demo-log-aop/README.md index 526a7da29..14fea8048 100644 --- a/demo-log-aop/README.md +++ b/demo-log-aop/README.md @@ -30,6 +30,11 @@ + + com.google.guava + guava + + org.springframework.boot spring-boot-starter-web @@ -86,73 +91,149 @@ *

* * @author yangkai.shen + * @author chen qi * @date Created in 2018-10-01 22:05 */ @Aspect @Component @Slf4j public class AopLog { - private static final String START_TIME = "request-start"; - - /** - * 切入点 - */ - @Pointcut("execution(public * com.xkcoding.log.aop.controller.*Controller.*(..))") - public void log() { - - } - - /** - * 前置操作 - * - * @param point 切入点 - */ - @Before("log()") - public void beforeLog(JoinPoint point) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); - - log.info("【请求 URL】:{}", request.getRequestURL()); - log.info("【请求 IP】:{}", request.getRemoteAddr()); - log.info("【请求类名】:{},【请求方法名】:{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); - - Map parameterMap = request.getParameterMap(); - log.info("【请求参数】:{},", JSONUtil.toJsonStr(parameterMap)); - Long start = System.currentTimeMillis(); - request.setAttribute(START_TIME, start); - } - - /** - * 环绕操作 - * - * @param point 切入点 - * @return 原方法返回值 - * @throws Throwable 异常信息 - */ - @Around("log()") - public Object aroundLog(ProceedingJoinPoint point) throws Throwable { - Object result = point.proceed(); - log.info("【返回值】:{}", JSONUtil.toJsonStr(result)); - return result; - } - - /** - * 后置操作 - */ - @AfterReturning("log()") - public void afterReturning() { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); - - Long start = (Long) request.getAttribute(START_TIME); - Long end = System.currentTimeMillis(); - log.info("【请求耗时】:{}毫秒", end - start); - - String header = request.getHeader("User-Agent"); - UserAgent userAgent = UserAgent.parseUserAgentString(header); - log.info("【浏览器类型】:{},【操作系统】:{},【原始User-Agent】:{}", userAgent.getBrowser().toString(), userAgent.getOperatingSystem().toString(), header); - } + /** + * 切入点 + */ + @Pointcut("execution(public * com.xkcoding.log.aop.controller.*Controller.*(..))") + public void log() { + + } + + /** + * 环绕操作 + * + * @param point 切入点 + * @return 原方法返回值 + * @throws Throwable 异常信息 + */ + @Around("log()") + public Object aroundLog(ProceedingJoinPoint point) throws Throwable { + + // 开始打印请求日志 + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + + // 打印请求相关参数 + long startTime = System.currentTimeMillis(); + Object result = point.proceed(); + String header = request.getHeader("User-Agent"); + UserAgent userAgent = UserAgent.parseUserAgentString(header); + + final Log l = Log.builder() + .threadId(Long.toString(Thread.currentThread().getId())) + .threadName(Thread.currentThread().getName()) + .ip(getIp(request)) + .url(request.getRequestURL().toString()) + .classMethod(String.format("%s.%s", point.getSignature().getDeclaringTypeName(), + point.getSignature().getName())) + .httpMethod(request.getMethod()) + .requestParams(getNameAndValue(point)) + .result(result) + .timeCost(System.currentTimeMillis() - startTime) + .userAgent(header) + .browser(userAgent.getBrowser().toString()) + .os(userAgent.getOperatingSystem().toString()).build(); + + log.info("Request Log Info : {}", JSONUtil.toJsonStr(l)); + + return result; + } + + /** + * 获取方法参数名和参数值 + * @param joinPoint + * @return + */ + private Map getNameAndValue(ProceedingJoinPoint joinPoint) { + + final Signature signature = joinPoint.getSignature(); + MethodSignature methodSignature = (MethodSignature) signature; + final String[] names = methodSignature.getParameterNames(); + final Object[] args = joinPoint.getArgs(); + + if (ArrayUtil.isEmpty(names) || ArrayUtil.isEmpty(args)) { + return Collections.emptyMap(); + } + if (names.length != args.length) { + log.warn("{}方法参数名和参数值数量不一致", methodSignature.getName()); + return Collections.emptyMap(); + } + Map map = Maps.newHashMap(); + for (int i = 0; i < names.length; i++) { + map.put(names[i], args[i]); + } + return map; + } + + private static final String UNKNOWN = "unknown"; + + /** + * 获取ip地址 + */ + public static String getIp(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + String comma = ","; + String localhost = "127.0.0.1"; + if (ip.contains(comma)) { + ip = ip.split(",")[0]; + } + if (localhost.equals(ip)) { + // 获取本机真正的ip地址 + try { + ip = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + log.error(e.getMessage(), e); + } + } + return ip; + } + + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + static class Log { + // 线程id + private String threadId; + // 线程名称 + private String threadName; + // ip + private String ip; + // url + private String url; + // http方法 GET POST PUT DELETE PATCH + private String httpMethod; + // 类方法 + private String classMethod; + // 请求参数 + private Object requestParams; + // 返回参数 + private Object result; + // 接口耗时 + private Long timeCost; + // 操作系统 + private String os; + // 浏览器 + private String browser; + // user-agent + private String userAgent; + } } ``` @@ -165,22 +246,36 @@ public class AopLog { *

* * @author yangkai.shen + * @author chen qi * @date Created in 2018-10-01 22:10 */ +@Slf4j @RestController public class TestController { - /** - * 测试方法 - * - * @param who 测试参数 - * @return {@link Dict} - */ - @GetMapping("/test") - public Dict test(String who) { - return Dict.create().set("who", StrUtil.isBlank(who) ? "me" : who); - } - + /** + * 测试方法 + * + * @param who 测试参数 + * @return {@link Dict} + */ + @GetMapping("/test") + public Dict test(String who) { + return Dict.create().set("who", StrUtil.isBlank(who) ? "me" : who); + } + + /** + * 测试post json方法 + * @param map 请求的json参数 + * @return {@link Dict} + */ + @PostMapping("/testJson") + public Dict testJson(@RequestBody Map map) { + + final String jsonStr = JSONUtil.toJsonStr(map); + log.info(jsonStr); + return Dict.create().set("json", map); + } } ``` From 0253039fe0d946b2e289120d1116ac15b344da13 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 24 Nov 2020 16:10:05 +0800 Subject: [PATCH 13/16] =?UTF-8?q?:sparkles:=20spring-boot-demo-ureport2=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-ureport2/README.md | 255 ++++++++++++++++-- demo-ureport2/pom.xml | 6 + .../src/main/resources/application.yml | 9 +- 3 files changed, 244 insertions(+), 26 deletions(-) diff --git a/demo-ureport2/README.md b/demo-ureport2/README.md index 90a6619f6..02151c671 100644 --- a/demo-ureport2/README.md +++ b/demo-ureport2/README.md @@ -1,13 +1,18 @@ -UReport2 是一款基于架构在 Spring 之上纯 Java 的高性能报表引擎,通过迭代单元格可以实现任意复杂的中国式报表。 在 UReport2 中,提供了全新的基于网页的报表设计器,可以在 Chrome、Firefox、Edge 等各种主流浏览器运行(IE 浏览器除外)。使用 UReport2,打开浏览器即可完成各种复杂报表的设计制作 +# spring-boot-demo-ureport2 -[https://www.w3cschool.cn/ureport](https://www.w3cschool.cn/ureport) +> 本 demo 主要演示了 Spring Boot 项目如何快速集成 ureport2 实现任意复杂的中国式报表功能。 -## 单机使用 +UReport2 是一款基于架构在 Spring 之上纯 Java 的高性能报表引擎,通过迭代单元格可以实现任意复杂的中国式报表。 在 UReport2 中,提供了全新的基于网页的报表设计器,可以在 Chrome、Firefox、Edge 等各种主流浏览器运行(IE 浏览器除外)。使用 UReport2,打开浏览器即可完成各种复杂报表的设计制作。 -- 1. 引入 jar 依赖 +## 1. 主要代码 -```xml +因为官方没有提供一个 starter 包,需要自己集成,这里使用 [pig](https://github.com/pig-mesh/pig) 作者 [冷冷同学](https://github.com/lltx) 开发的 starter 偷懒实现,这个 starter 不仅支持单机环境的配置,同时支持集群环境。 + +### 1.1. 单机使用 + +#### 1.1.1. `pom.xml` 新增依赖 +```xml com.pig4cloud.plugin ureport-spring-boot-starter @@ -15,24 +20,209 @@ UReport2 是一款基于架构在 Spring 之上纯 Java 的高性能报表引擎 ``` -- application.properties 配置本地文件保存路径 +#### 1.1.2. `application.yml` 修改配置文件 -```properties -ureport.debug=false -ureport.disableFileProvider=false -ureport.fileStoreDir=/Users/lengleng/Downloads -ureport.disableHttpSessionReportCache=true +```yaml +server: + port: 8080 + servlet: + context-path: /demo +spring: + datasource: + url: jdbc:mysql://127.0.0.1:3306/spring-boot-demo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=GMT%2B8 + username: root + password: root + driver-class-name: com.mysql.cj.jdbc.Driver +ureport: + debug: false + disableFileProvider: false + disableHttpSessionReportCache: true + # 单机模式,本地路径需要提前创建 + fileStoreDir: '/Users/yk.shen/Desktop/ureport2' ``` -- 访问 报表设计器 +#### 1.1.3. 新增一个内部数据源 -http://127.0.0.1:8080/ureport/designer +```java +@Component +public class InnerDatasource implements BuildinDatasource { + @Autowired + private DataSource datasource; -## 集群使用 + @Override + public String name() { + return "内部数据源"; + } -如上文设计好的模板是保存在服务本机的,在集群环境中需要使用统一的文件系统存储。新增依赖 + @SneakyThrows + @Override + public Connection getConnection() { + return datasource.getConnection(); + } +} +``` -```xml +#### 1.1.4. 使用 `doc/sql/t_user_ureport2.sql` 初始化数据 + +```mysql +DROP TABLE IF EXISTS `t_user_ureport2`; +CREATE TABLE `t_user_ureport2` ( + `id` bigint(13) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(255) COLLATE utf8mb4_bin NOT NULL COMMENT '姓名', + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', + `status` tinyint(4) NOT NULL COMMENT '是否禁用', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +BEGIN; +INSERT INTO `t_user_ureport2` VALUES (1, '测试人员 1', '2020-10-22 09:01:58', 1); +INSERT INTO `t_user_ureport2` VALUES (2, '测试人员 2', '2020-10-22 09:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (3, '测试人员 3', '2020-10-23 03:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (4, '测试人员 4', '2020-10-23 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (5, '测试人员 5', '2020-10-23 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (6, '测试人员 6', '2020-10-24 11:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (7, '测试人员 7', '2020-10-24 20:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (8, '测试人员 8', '2020-10-25 08:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (9, '测试人员 9', '2020-10-25 09:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (10, '测试人员 10', '2020-10-25 13:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (11, '测试人员 11', '2020-10-26 21:02:00', 0); +INSERT INTO `t_user_ureport2` VALUES (12, '测试人员 12', '2020-10-26 23:02:00', 1); +INSERT INTO `t_user_ureport2` VALUES (13, '测试人员 13', '2020-10-26 23:02:00', 1); +COMMIT; +``` + +#### 1.1.5. 访问报表设计器 + +http://127.0.0.1:8080/demo/ureport/designer + +![报表设计页](http://static.xkcoding.com/spring-boot-demo/ureport2/035330.png) + +#### 1.1.6. 开始设计 + +##### 1.1.6.1. 选择数据源 + +这里就需要使用到上面步骤 1.1.3 创建的内部数据源如图 + +![选择数据源](http://static.xkcoding.com/spring-boot-demo/ureport2/040032.png) + +选择数据源 + +![选择数据源](http://static.xkcoding.com/spring-boot-demo/ureport2/040117.png) + +此时列表里就会出现数据源 + +![数据源列表](http://static.xkcoding.com/spring-boot-demo/ureport2/040237.png) + +##### 1.1.6.2. 选择数据集 + +在刚才选中的数据源右键,选择添加数据集 + +![选中数据源右键](http://static.xkcoding.com/spring-boot-demo/ureport2/063315.png) + +这里选择上面步骤 1.1.4 中初始化的用户表 + +![创建用户报表](http://static.xkcoding.com/spring-boot-demo/ureport2/063845.png) + +预览数据看一下 + +![预览数据集数据](http://static.xkcoding.com/spring-boot-demo/ureport2/063955.png) + +点击确定,保存数据集 + +![保存数据集](http://static.xkcoding.com/spring-boot-demo/ureport2/064049.png) + +##### 1.1.6.3. 报表设计 + +创建报表表头的位置 + +![合并单元格](http://static.xkcoding.com/spring-boot-demo/ureport2/064425.png) + +表头内容 + +![image-20201124144752390](http://static.xkcoding.com/spring-boot-demo/ureport2/064752.png) + +操作完成之后,长这样~ + +![表头美化](http://static.xkcoding.com/spring-boot-demo/ureport2/064916.png) + + + +然后设置数据的标题行,跟表头设置一样,效果如下图 + +![数据的标题行](http://static.xkcoding.com/spring-boot-demo/ureport2/065125.png) + +接下来设置数据 + +![id字段配置](http://static.xkcoding.com/spring-boot-demo/ureport2/065658.png) + +其他字段同理,完成之后如下 +![数据配置](http://static.xkcoding.com/spring-boot-demo/ureport2/070440.png) + +此时你可以尝试预览一下数据了 + +![预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/070634.png) + +![预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/070813.png) + +关掉,稍微美化一下 + +![美化后的预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/070910.png) + +此时数据虽然正常显示了,但是「是否可用」这一列显示0/1 是否可以支持自定义呢? + +![映射数据集](http://static.xkcoding.com/spring-boot-demo/ureport2/071352.png) + +再次预览一下 + +![字典映射预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/071428.png) + +顺带再把创建时间的数据格式也改一下 + +![时间格式修改](http://static.xkcoding.com/spring-boot-demo/ureport2/072725.png) + +修改后,预览数据如下 + +![预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/072753.png) + +##### 1.1.6.4. 保存报表设计文件 + +![image-20201124153244035](http://static.xkcoding.com/spring-boot-demo/ureport2/073244.png) + +![保存](http://static.xkcoding.com/spring-boot-demo/ureport2/074228.png) + +点击保存之后,你本地在 `application.yml` 文件中配置的地址就会出现一个 `demo.ureport.xml` 文件 + +下次可以直接通过 http://localhost:8080/demo/ureport/preview?_u=file:demo.ureport.xml 这个地址预览报表了 + +##### 1.1.6.5. 增加报表查询条件 + +还记得我们上面新增数据集的时候,加的条件吗?现在用起来 + +![查询表单设计器](http://static.xkcoding.com/spring-boot-demo/ureport2/074641.png) + +查询表单设计 + +![拖动元素设计表单查询](http://static.xkcoding.com/spring-boot-demo/ureport2/074936.png) + +配置查询参数 + +![完善查询表单](http://static.xkcoding.com/spring-boot-demo/ureport2/075248.png) + +美化按钮 + +![按钮样式美化](http://static.xkcoding.com/spring-boot-demo/ureport2/075410.png) + +在预览一下~ + +![预览数据-查询条件](http://static.xkcoding.com/spring-boot-demo/ureport2/075640.png) + +### 1.2. 集群使用 + +如上文设计好的模板是保存在服务本机的,在集群环境中需要使用统一的文件系统存储。 + +#### 1.2.1. 新增依赖 + +```xml com.pig4cloud.plugin oss-spring-boot-starter @@ -40,14 +230,31 @@ http://127.0.0.1:8080/ureport/designer ``` -- 仅需配置云存储相关参数, 演示为minio +#### 1.2.2. 仅需配置云存储相关参数, 演示为minio +```yaml +oss: + access-key: lengleng + secret-key: lengleng + bucket-name: lengleng + endpoint: http://minio.pig4cloud.com ``` -oss.access-key=lengleng -oss.secret-key=lengleng -oss.bucket-name=lengleng -oss.endpoint=http://minio.pig4cloud.com -``` -关于 [oss-spring-boot-starter ](https://github.com/pig-mesh/oss-spring-boot-starter)使用可参考,兼容所有 S3 协议的分布式文件存储系统 -关于 [ureport-spring-boot-starter ](https://github.com/pig-mesh/ureport-spring-boot-starter)使用可参考,UReport2 的 spring boot 封装 +> 注意:这里使用的是冷冷提供的公共 minio,请勿乱用,也不保证数据的可靠性,建议小伙伴自建一个minio,或者使用阿里云 oss + +## 2. 坑 + +Ureport2 最新版本是 `2.2.9`,挺久没更新了,存在一个坑:在报表设计页打开一个已存在的报表设计文件时,可能会出现无法预览的情况,参考 ISSUE:https://github.com/youseries/ureport/issues/393 + +注意:该可能性出现在报表设计文件中使用了条件属性的情况下,修复方法就是打开文件之后,重新配置条件属性,此处是坑,小伙伴使用时注意下就好,最好的方法就是避免使用条件属性。 + +## 3. 感谢 + +再次感谢 [@冷冷](https://github.com/lltx) 提供的 starter 及 PR,因个人操作失误,PR 未被合并,抱歉~ + +## 4. 参考 + +- [ureport2 使用文档](https://www.w3cschool.cn/ureport) +- [ureport-spring-boot-starter](https://github.com/pig-mesh/ureport-spring-boot-starter) UReport2 的 spring boot 封装 +- [oss-spring-boot-starter](https://github.com/pig-mesh/oss-spring-boot-starter) 兼容所有 S3 协议的分布式文件存储系统 + diff --git a/demo-ureport2/pom.xml b/demo-ureport2/pom.xml index 8976d3903..c92864f50 100644 --- a/demo-ureport2/pom.xml +++ b/demo-ureport2/pom.xml @@ -46,6 +46,12 @@ 0.0.1
+ + + + + + org.springframework.boot spring-boot-starter-test diff --git a/demo-ureport2/src/main/resources/application.yml b/demo-ureport2/src/main/resources/application.yml index 811024fdc..1246b55d1 100644 --- a/demo-ureport2/src/main/resources/application.yml +++ b/demo-ureport2/src/main/resources/application.yml @@ -12,5 +12,10 @@ ureport: debug: false disableFileProvider: false disableHttpSessionReportCache: true - # 单机模式,路径需要提前创建 - fileStoreDir: '/Users/yangkai.shen/Desktop/ureport2' + # 单机模式,本地路径需要提前创建 + fileStoreDir: '/Users/yk.shen/Desktop/ureport2' +#oss: +# access-key: lengleng +# secret-key: lengleng +# bucket-name: lengleng +# endpoint: http://minio.pig4cloud.com From 247abe1e6673698f569c1359fad53fc62cb408d1 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 24 Nov 2020 16:16:55 +0800 Subject: [PATCH 14/16] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20TODO.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.en.md | 4 ++-- TODO.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO.en.md b/TODO.en.md index a2c0ad8dd..ae1bca256 100644 --- a/TODO.en.md +++ b/TODO.en.md @@ -1,6 +1,6 @@ # spring-boot-demo Project TODO List -## Module plan (completed: 54 / 66) +## Module plan (completed: 55 / 66) - [x] ~~demo-helloworld(helloworld example)~~ - [x] ~~demo-properties (read configuration file information)~~ @@ -40,7 +40,7 @@ - [x] ~~demo-mq-kafka (integrated message middleware - Kafka)~~ - [x] ~~demo-websocket (integrated websocket service)~~ - [x] ~~demo-websocket-socketio (integrated socketio implements websocket service)~~ -- [ ] demo-ureport2 (integrated ureport2 implements a custom complex Chinese-style reporting engine) +- [x] ~~demo-ureport2 (integrated ureport2 implements a custom complex Chinese-style reporting engine)~~ - [ ] demo-uflo (integrated uflo implementation process control engine) - [ ] demo-urule (integrated urule implementation rules engine) - [ ] demo-activiti (integrated of Activiti to implement process control engine) diff --git a/TODO.md b/TODO.md index ad64d2659..0b35d2651 100644 --- a/TODO.md +++ b/TODO.md @@ -1,6 +1,6 @@ # spring-boot-demo 项目待办列表 -## 模块计划(已完成:54 / 66) +## 模块计划(已完成:55 / 66) - [x] ~~demo-helloworld(Helloworld 示例)~~ - [x] ~~demo-properties(读取配置文件信息)~~ @@ -40,7 +40,7 @@ - [x] ~~demo-mq-kafka(集成消息中间件 - Kafka)~~ - [x] ~~demo-websocket(集成 websocket 服务)~~ - [x] ~~demo-websocket-socketio(集成 socketio 实现 websocket 服务)~~ -- [ ] demo-ureport2 (集成 ureport2 实现自定义的复杂中国式报表引擎) +- [x] ~~demo-ureport2 (集成 ureport2 实现自定义的复杂中国式报表引擎)~~ - [ ] demo-uflo(集成 uflo 实现流程控制引擎) - [ ] demo-urule(集成 urule 实现规则引擎) - [ ] demo-activiti(集成 Activiti 实现流程控制引擎) From b38b59a40fd11092acaa9f5b56cec5c7e525c54d Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 24 Nov 2020 16:17:14 +0800 Subject: [PATCH 15/16] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 127 ++++++++++++++++++++++++++------------------------- README.md | 127 ++++++++++++++++++++++++++------------------------- 2 files changed, 128 insertions(+), 126 deletions(-) diff --git a/README.en.md b/README.en.md index e949b4dd2..d3a479a5b 100644 --- a/README.en.md +++ b/README.en.md @@ -20,9 +20,9 @@ ## Introduction -`spring boot demo` is a project for learning and practicing `spring boot`, including `66` demos, and `54` of them have been done. +`spring boot demo` is a project for learning and practicing `spring boot`, including `66` demos, and `55` of them have been done. -This project has integrated actuator (`monitoring`), admin (`visual monitoring`), logback (`log`), aopLog (`recording web request logs through AOP`), global exception handling (`json level and page level` ), freemarker (`template engine`), thymeleaf (`template engine`), Beetl (`template engine`), Enjoy (`template engine`), JdbcTemplate (`general JDBC operate database`), JPA (`powerful ORM framework `), mybatis (`powerful ORM framework`), Generic Mapper (`mybatis quick operation `), PageHelper (`powerful mybatis pagination plugin`), mybatis-plus (`mybatis quick operation`), BeetlSQL (`powerful ORM framework `), upload (`local file upload and qiniu cloud file upload`), redis (`cache`), ehcache (`cache`), email (`send various types of mail`), task (`basic scheduled tasks`), quartz (`dynamic management scheduled tasks`), xxl-job (`distributed scheduled tasks`), swagger (`API interface management and tests`), security (`RBAC-based Dynamic Rights Authentication`), SpringSession (`session sharing`), Zookeeper (`implement distributed locks by AOP`), RabbitMQ (`message queue`), Kafka (`message queue`), websocket (` server pushes the monitoring server status to front end `), socket.io (`chat room`), ureport2 (`Chinese-style report`), packaged into a `war` file, integrate ElasticSearch (`basic operations and advanced queries`), Async ( `asynchronous tasks`), integrated Dubbo (`with official starter`), MongoDB (`document database`), neo4j (`graph database`), docker (`container`), `JPA Multi-Datasource`, `Mybatis Multi-Datasource`, `code generator`', GrayLog (`log collection`), JustAuth (`third-party login`), LDAP(`CURD`), `Dynamically add/switch datasources`, Standalone RateLimiting(`AOP + Guava RateLimiter`), Distributed Ratelimiting(`AOP + Redis + Lua`), ElasticSearch 7.x(`use official Rest High Level Client`), HTTPS, Flyway(`initialize databases`). +This project has integrated actuator (`monitoring`), admin (`visual monitoring`), logback (`log`), aopLog (`recording web request logs through AOP`), global exception handling (`json level and page level` ), freemarker (`template engine`), thymeleaf (`template engine`), Beetl (`template engine`), Enjoy (`template engine`), JdbcTemplate (`general JDBC operate database`), JPA (`powerful ORM framework `), mybatis (`powerful ORM framework`), Generic Mapper (`mybatis quick operation `), PageHelper (`powerful mybatis pagination plugin`), mybatis-plus (`mybatis quick operation`), BeetlSQL (`powerful ORM framework `), upload (`local file upload and qiniu cloud file upload`), redis (`cache`), ehcache (`cache`), email (`send various types of mail`), task (`basic scheduled tasks`), quartz (`dynamic management scheduled tasks`), xxl-job (`distributed scheduled tasks`), swagger (`API interface management and tests`), security (`RBAC-based Dynamic Rights Authentication`), SpringSession (`session sharing`), Zookeeper (`implement distributed locks by AOP`), RabbitMQ (`message queue`), Kafka (`message queue`), websocket (` server pushes the monitoring server status to front end `), socket.io (`chat room`), ureport2 (`Chinese-style report`), packaged into a `war` file, integrate ElasticSearch (`basic operations and advanced queries`), Async ( `asynchronous tasks`), integrated Dubbo (`with official starter`), MongoDB (`document database`), neo4j (`graph database`), docker (`container`), `JPA Multi-Datasource`, `Mybatis Multi-Datasource`, `code generator`', GrayLog (`log collection`), JustAuth (`third-party login`), LDAP(`CURD`), `Dynamically add/switch datasources`, Standalone RateLimiting(`AOP + Guava RateLimiter`), Distributed Ratelimiting(`AOP + Redis + Lua`), ElasticSearch 7.x(`use official Rest High Level Client`), HTTPS, Flyway(`initialize databases`),UReport2(`Chinese complex report `). > If you have demos to contribute or needs to meet, it is very welcome to submit a [issue](https://github.com/xkcoding/spring-boot-demo/issues/new) and I will add it to my [TODO](./TODO.en.md) list. @@ -72,70 +72,71 @@ View the [TODO](./TODO.en.md) file | Module Name | Module Description | | ------------------------------------------------------------ | ------------------------------------------------------------ | -| [demo-helloworld](./demo-helloworld) | a helloworld demo. | -| [demo-properties](./demo-properties) | a demo to read the contents of configuration file. | -| [demo-actuator](./demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. | -| [demo-admin-client](./demo-admin/admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. | -| [demo-admin-server](./demo-admin/admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. | -| [demo-logback](./demo-logback) | a demo to integrate the logback for logging. | -| [demo-log-aop](./demo-log-aop) | a demo to record web request logs using AOP aspect. | -| [demo-exception-handler](./demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. | -| [demo-template-freemarker](./demo-template-freemarker) | a demo to integrate Freemarker template engine. | -| [demo-template-thymeleaf](./demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. | -| [demo-template-beetl](./demo-template-beetl) | a demo to integrate Beetl template engine. | -| [demo-template-enjoy](./demo-template-enjoy) | a demo to integrate Enjoy template engine. | -| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. | -| [demo-orm-jpa](./demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. | -| [demo-orm-mybatis](./demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. | +| [demo-helloworld](./demo-helloworld) | a helloworld demo. | +| [demo-properties](./demo-properties) | a demo to read the contents of configuration file. | +| [demo-actuator](./demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. | +| [demo-admin-client](./demo-admin/admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. | +| [demo-admin-server](./demo-admin/admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. | +| [demo-logback](./demo-logback) | a demo to integrate the logback for logging. | +| [demo-log-aop](./demo-log-aop) | a demo to record web request logs using AOP aspect. | +| [demo-exception-handler](./demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. | +| [demo-template-freemarker](./demo-template-freemarker) | a demo to integrate Freemarker template engine. | +| [demo-template-thymeleaf](./demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. | +| [demo-template-beetl](./demo-template-beetl) | a demo to integrate Beetl template engine. | +| [demo-template-enjoy](./demo-template-enjoy) | a demo to integrate Enjoy template engine. | +| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. | +| [demo-orm-jpa](./demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. | +| [demo-orm-mybatis](./demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. | | [demo-orm-mybatis-mapper-page](./demo-orm-mybatis-mapper-page) | a demo to integrate [Mapper](https://github.com/abel533/Mapper) and [PageHelper](https://github.com/pagehelper/Mybatis-PageHelper) by using [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) and [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) dependencies. | -| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. | -| [demo-orm-beetlsql](./demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. | -| [demo-upload](./demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. | -| [demo-cache-redis](./demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. | -| [demo-cache-ehcache](./demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. | -| [demo-email](./demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. | -| [demo-task](./demo-task) | a demo to show easy to use scheduled task. | -| [demo-task-quartz](./demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. | -| [demo-task-xxl-job](./demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. | -| [demo-swagger](./demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. | -| [demo-swagger-beauty](./demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. | -| [demo-rbac-security](./demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. | -| [demo-rbac-shiro](./demo-rbac-shiro) | NOT FINISHED YET!
a demo to integrate shiro for authentication management. | -| [demo-session](./demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. | -| [demo-oauth](./demo-oauth) | NOT FINISHED YET!
a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. | -| [demo-social](./demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. | -| [demo-zookeeper](./demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. | -| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. | -| [demo-mq-rocketmq](./demo-mq-rocketmq) | NOT FINISHED YET!
a demo to integrate RocketMQ implementation for message delivery and reception. | -| [demo-mq-kafka](./demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. | -| [demo-websocket](./demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | -| [demo-websocket-socketio](./demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. | -| [demo-ureport2](./demo-ureport2) | NOT FINISHED YET!
a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. | -| [demo-uflo](./demo-uflo) | NOT FINISHED YET!
a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. | -| [demo-urule](./demo-urule) | NOT FINISHED YET!
a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. | -| [demo-activiti](./demo-activiti) | NOT FINISHED YET!
a demo to integrate Activiti 7 process engine. | -| [demo-async](./demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. | -| [demo-war](./demo-war) | packaged into a war format configuration | -| [demo-elasticsearch](./demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. | -| [demo-dubbo](./demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. | -| [demo-mongodb](./demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. | -| [demo-neo4j](./demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. | -| [demo-docker](./demo-docker) | docker container. | -| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. | +| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. | +| [demo-orm-beetlsql](./demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. | +| [demo-upload](./demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. | +| [demo-cache-redis](./demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. | +| [demo-cache-ehcache](./demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. | +| [demo-email](./demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. | +| [demo-task](./demo-task) | a demo to show easy to use scheduled task. | +| [demo-task-quartz](./demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. | +| [demo-task-xxl-job](./demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. | +| [demo-swagger](./demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. | +| [demo-swagger-beauty](./demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. | +| [demo-rbac-security](./demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. | +| [demo-rbac-shiro](./demo-rbac-shiro) | NOT FINISHED YET!
a demo to integrate shiro for authentication management. | +| [demo-session](./demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. | +| [demo-oauth](./demo-oauth) | NOT FINISHED YET!
a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. | +| [demo-social](./demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. | +| [demo-zookeeper](./demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. | +| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. | +| [demo-mq-rocketmq](./demo-mq-rocketmq) | NOT FINISHED YET!
a demo to integrate RocketMQ implementation for message delivery and reception. | +| [demo-mq-kafka](./demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. | +| [demo-websocket](./demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. | +| [demo-websocket-socketio](./demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. | +| [demo-ureport2](./demo-ureport2) | NOT FINISHED YET!
a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. | +| [demo-uflo](./demo-uflo) | NOT FINISHED YET!
a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. | +| [demo-urule](./demo-urule) | NOT FINISHED YET!
a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. | +| [demo-activiti](./demo-activiti) | NOT FINISHED YET!
a demo to integrate Activiti 7 process engine. | +| [demo-async](./demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. | +| [demo-war](./demo-war) | packaged into a war format configuration | +| [demo-elasticsearch](./demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. | +| [demo-dubbo](./demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. | +| [demo-mongodb](./demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. | +| [demo-neo4j](./demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. | +| [demo-docker](./demo-docker) | docker container. | +| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. | | [demo-multi-datasource-mybatis](./demo-multi-datasource-mybatis) | a demo to implement Mybatis multi-datasource by using an open source solution from Mybatis-Plus. | -| [demo-sharding-jdbc](./demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. | -| [demo-tio](./demo-tio) | NOT FINISHED YET!
a demo to integrate t-io(a network programming framework like netty). | -| demo-grpc | NOT FINISHED YET!
a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). | -| [demo-codegen](./demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. | -| [demo-graylog](./demo-graylog) | a demo to integrate graylog for unified log collection. | -| demo-sso | NOT FINISHED YET!
a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). | -| [demo-ldap](./demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). | -| [demo-dynamic-datasource](./demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. | -| [demo-ratelimit-guava](./demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. | -| [demo-ratelimit-redis](./demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. | -| [demo-https](./demo-https) | a demo to integrate HTTPS. | +| [demo-sharding-jdbc](./demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. | +| [demo-tio](./demo-tio) | NOT FINISHED YET!
a demo to integrate t-io(a network programming framework like netty). | +| demo-grpc | NOT FINISHED YET!
a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). | +| [demo-codegen](./demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. | +| [demo-graylog](./demo-graylog) | a demo to integrate graylog for unified log collection. | +| demo-sso | NOT FINISHED YET!
a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). | +| [demo-ldap](./demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). | +| [demo-dynamic-datasource](./demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. | +| [demo-ratelimit-guava](./demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. | +| [demo-ratelimit-redis](./demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. | +| [demo-https](./demo-https) | a demo to integrate HTTPS. | | [demo-elasticsearch-rest-high-level-client](./demo-elasticsearch-rest-high-level-client) | a demo to integrate ElasticSearch 7.x version by using official Rest High Level Client to operate ES data. | -| [demo-flyway](./demo-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. | +| [demo-flyway](./demo-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. | +| [demo-ureport2](./demo-ureport2) | a demo to integrate Ureport2 to design the Chinese complex report file. | ### Thanks diff --git a/README.md b/README.md index 5f7c08c99..2d9b99a36 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ ## 项目简介 -`spring boot demo` 是一个用来深度学习并实战 `spring boot` 的项目,目前总共包含 **`66`** 个集成demo,已经完成 **`54`** 个。 +`spring boot demo` 是一个用来深度学习并实战 `spring boot` 的项目,目前总共包含 **`66`** 个集成demo,已经完成 **`55`** 个。 -该项目已成功集成 actuator(`监控`)、admin(`可视化监控`)、logback(`日志`)、aopLog(`通过AOP记录web请求日志`)、统一异常处理(`json级别和页面级别`)、freemarker(`模板引擎`)、thymeleaf(`模板引擎`)、Beetl(`模板引擎`)、Enjoy(`模板引擎`)、JdbcTemplate(`通用JDBC操作数据库`)、JPA(`强大的ORM框架`)、mybatis(`强大的ORM框架`)、通用Mapper(`快速操作Mybatis`)、PageHelper(`通用的Mybatis分页插件`)、mybatis-plus(`快速操作Mybatis`)、BeetlSQL(`强大的ORM框架`)、upload(`本地文件上传和七牛云文件上传`)、redis(`缓存`)、ehcache(`缓存`)、email(`发送各种类型邮件`)、task(`基础定时任务`)、quartz(`动态管理定时任务`)、xxl-job(`分布式定时任务`)、swagger(`API接口管理测试`)、security(`基于RBAC的动态权限认证`)、SpringSession(`Session共享`)、Zookeeper(`结合AOP实现分布式锁`)、RabbitMQ(`消息队列`)、Kafka(`消息队列`)、websocket(`服务端推送监控服务器运行信息`)、socket.io(`聊天室`)、ureport2(`中国式报表`)、打包成`war`文件、集成 ElasticSearch(`基本操作和高级查询`)、Async(`异步任务`)、集成Dubbo(`采用官方的starter`)、MongoDB(`文档数据库`)、neo4j(`图数据库`)、docker(`容器化`)、`JPA多数据源`、`Mybatis多数据源`、`代码生成器`、GrayLog(`日志收集`)、JustAuth(`第三方登录`)、LDAP(`增删改查`)、`动态添加/切换数据源`、单机限流(`AOP + Guava RateLimiter`)、分布式限流(`AOP + Redis + Lua`)、ElasticSearch 7.x(`使用官方 Rest High Level Client`)、HTTPS、Flyway(`数据库初始化`)。 +该项目已成功集成 actuator(`监控`)、admin(`可视化监控`)、logback(`日志`)、aopLog(`通过AOP记录web请求日志`)、统一异常处理(`json级别和页面级别`)、freemarker(`模板引擎`)、thymeleaf(`模板引擎`)、Beetl(`模板引擎`)、Enjoy(`模板引擎`)、JdbcTemplate(`通用JDBC操作数据库`)、JPA(`强大的ORM框架`)、mybatis(`强大的ORM框架`)、通用Mapper(`快速操作Mybatis`)、PageHelper(`通用的Mybatis分页插件`)、mybatis-plus(`快速操作Mybatis`)、BeetlSQL(`强大的ORM框架`)、upload(`本地文件上传和七牛云文件上传`)、redis(`缓存`)、ehcache(`缓存`)、email(`发送各种类型邮件`)、task(`基础定时任务`)、quartz(`动态管理定时任务`)、xxl-job(`分布式定时任务`)、swagger(`API接口管理测试`)、security(`基于RBAC的动态权限认证`)、SpringSession(`Session共享`)、Zookeeper(`结合AOP实现分布式锁`)、RabbitMQ(`消息队列`)、Kafka(`消息队列`)、websocket(`服务端推送监控服务器运行信息`)、socket.io(`聊天室`)、ureport2(`中国式报表`)、打包成`war`文件、集成 ElasticSearch(`基本操作和高级查询`)、Async(`异步任务`)、集成Dubbo(`采用官方的starter`)、MongoDB(`文档数据库`)、neo4j(`图数据库`)、docker(`容器化`)、`JPA多数据源`、`Mybatis多数据源`、`代码生成器`、GrayLog(`日志收集`)、JustAuth(`第三方登录`)、LDAP(`增删改查`)、`动态添加/切换数据源`、单机限流(`AOP + Guava RateLimiter`)、分布式限流(`AOP + Redis + Lua`)、ElasticSearch 7.x(`使用官方 Rest High Level Client`)、HTTPS、Flyway(`数据库初始化`)、UReport2(`中国式复杂报表`)。 > 如果大家还有想要集成的demo,也可在 [issue](https://github.com/xkcoding/spring-boot-demo/issues/new) 里提需求。我会额外添加在 [TODO](./TODO.md) 列表里。✊ @@ -76,70 +76,71 @@ | Module 名称 | Module 介绍 | | ------------------------------------------------------------ | ------------------------------------------------------------ | -| [demo-helloworld](./demo-helloworld) | spring-boot 的一个 helloworld | -| [demo-properties](./demo-properties) | spring-boot 读取配置文件中的内容 | -| [demo-actuator](./demo-actuator) | spring-boot 集成 spring-boot-starter-actuator 用于监控 spring-boot 的启动和运行状态 | -| [demo-admin-client](./demo-admin/admin-client) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,客户端示例 | -| [demo-admin-server](./demo-admin/admin-server) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,服务端示例 | -| [demo-logback](./demo-logback) | spring-boot 集成 logback 日志 | -| [demo-log-aop](./demo-log-aop) | spring-boot 使用 AOP 切面的方式记录 web 请求日志 | -| [demo-exception-handler](./demo-exception-handler) | spring-boot 统一异常处理,包括2种,第一种返回统一的 json 格式,第二种统一跳转到异常页面 | -| [demo-template-freemarker](./demo-template-freemarker) | spring-boot 集成 Freemarker 模板引擎 | -| [demo-template-thymeleaf](./demo-template-thymeleaf) | spring-boot 集成 Thymeleaf 模板引擎 | -| [demo-template-beetl](./demo-template-beetl) | spring-boot 集成 Beetl 模板引擎 | -| [demo-template-enjoy](./demo-template-enjoy) | spring-boot 集成 Enjoy 模板引擎 | -| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | spring-boot 集成 Jdbc Template 操作数据库,并简易封装通用 Dao 层 | -| [demo-orm-jpa](./demo-orm-jpa) | spring-boot 集成 spring-boot-starter-data-jpa 操作数据库 | -| [demo-orm-mybatis](./demo-orm-mybatis) | spring-boot 集成原生mybatis,使用 [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) 集成 | +| [demo-helloworld](./demo-helloworld) | spring-boot 的一个 helloworld | +| [demo-properties](./demo-properties) | spring-boot 读取配置文件中的内容 | +| [demo-actuator](./demo-actuator) | spring-boot 集成 spring-boot-starter-actuator 用于监控 spring-boot 的启动和运行状态 | +| [demo-admin-client](./demo-admin/admin-client) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,客户端示例 | +| [demo-admin-server](./demo-admin/admin-server) | spring-boot 集成 spring-boot-admin 来可视化的监控 spring-boot 程序的运行状态,可以与 actuator 互相搭配使用,服务端示例 | +| [demo-logback](./demo-logback) | spring-boot 集成 logback 日志 | +| [demo-log-aop](./demo-log-aop) | spring-boot 使用 AOP 切面的方式记录 web 请求日志 | +| [demo-exception-handler](./demo-exception-handler) | spring-boot 统一异常处理,包括2种,第一种返回统一的 json 格式,第二种统一跳转到异常页面 | +| [demo-template-freemarker](./demo-template-freemarker) | spring-boot 集成 Freemarker 模板引擎 | +| [demo-template-thymeleaf](./demo-template-thymeleaf) | spring-boot 集成 Thymeleaf 模板引擎 | +| [demo-template-beetl](./demo-template-beetl) | spring-boot 集成 Beetl 模板引擎 | +| [demo-template-enjoy](./demo-template-enjoy) | spring-boot 集成 Enjoy 模板引擎 | +| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | spring-boot 集成 Jdbc Template 操作数据库,并简易封装通用 Dao 层 | +| [demo-orm-jpa](./demo-orm-jpa) | spring-boot 集成 spring-boot-starter-data-jpa 操作数据库 | +| [demo-orm-mybatis](./demo-orm-mybatis) | spring-boot 集成原生mybatis,使用 [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) 集成 | | [demo-orm-mybatis-mapper-page](./demo-orm-mybatis-mapper-page) | spring-boot 集成[通用Mapper](https://github.com/abel533/Mapper)和[PageHelper](https://github.com/pagehelper/Mybatis-PageHelper),使用 [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) 和 [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) 集成 | -| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | spring-boot 集成 [mybatis-plus](https://mybatis.plus/),使用 [mybatis-plus-boot-starter](http://mp.baomidou.com/) 集成,集成 BaseMapper、BaseService、ActiveRecord 操作数据库 | -| [demo-orm-beetlsql](./demo-orm-beetlsql) | spring-boot 集成 [beetl-sql](http://ibeetl.com/guide/#beetlsql),使用 [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) 集成 | -| [demo-upload](./demo-upload) | spring-boot 文件上传示例,包含本地文件上传以及七牛云文件上传 | -| [demo-cache-redis](./demo-cache-redis) | spring-boot 整合 redis,操作redis中的数据,并使用redis缓存数据 | -| [demo-cache-ehcache](./demo-cache-ehcache) | spring-boot 整合 ehcache,使用 ehcache 缓存数据 | -| [demo-email](./demo-email) | spring-boot 整合 email,包括发送简单文本邮件、HTML邮件(包括模板HTML邮件)、附件邮件、静态资源邮件 | -| [demo-task](./demo-task) | spring-boot 快速实现定时任务 | -| [demo-task-quartz](./demo-task-quartz) | spring-boot 整合 quartz,并实现对定时任务的管理,包括新增定时任务,删除定时任务,暂停定时任务,恢复定时任务,修改定时任务启动时间,以及定时任务列表查询,`提供前端页面` | -| [demo-task-xxl-job](./demo-task-xxl-job) | spring-boot 整合[xxl-job](http://www.xuxueli.com/xxl-job/en/#/),并提供绕过 `xxl-job-admin` 对定时任务的管理的方法,包括定时任务列表,触发器列表,新增定时任务,删除定时任务,停止定时任务,启动定时任务,修改定时任务,手动触发定时任务 | -| [demo-swagger](./demo-swagger) | spring-boot 集成原生的 `swagger` 用于统一管理、测试 API 接口 | -| [demo-swagger-beauty](./demo-swagger-beauty) | spring-boot 集成第三方 `swagger` [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) 美化API文档样式,用于统一管理、测试 API 接口 | -| [demo-rbac-security](./demo-rbac-security) | spring-boot 集成 spring security 完成基于RBAC权限模型的权限管理,支持自定义过滤请求,动态权限认证,使用 JWT 安全认证,支持在线人数统计,手动踢出用户等操作 | -| [demo-rbac-shiro](./demo-rbac-shiro) | spring-boot 集成 shiro 实现权限管理
待完成 | -| [demo-session](./demo-session) | spring-boot 集成 Spring Session 实现Session共享、重启程序Session不失效 | -| [demo-oauth](./demo-oauth) | spring-boot 实现 oauth 服务器功能,实现授权码机制
待完成 | -| [demo-social](./demo-social) | spring-boot 集成第三方登录,集成 `justauth-spring-boot-starter` 实现QQ登录、GitHub登录、微信登录、谷歌登录、微软登录、小米登录、企业微信登录。 | -| [demo-zookeeper](./demo-zookeeper) | spring-boot 集成 Zookeeper 结合AOP实现分布式锁 | -| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | spring-boot 集成 RabbitMQ 实现基于直接队列模式、分列模式、主题模式、延迟队列的消息发送和接收 | -| [demo-mq-rocketmq](./demo-mq-rocketmq) | spring-boot 集成 RocketMQ,实现消息的发送和接收
待完成 | -| [demo-mq-kafka](./demo-mq-kafka) | spring-boot 集成 kafka,实现消息的发送和接收 | -| [demo-websocket](./demo-websocket) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | -| [demo-websocket-socketio](./demo-websocket-socketio) | spring-boot 使用 netty-socketio 集成 websocket,实现一个简单的聊天室 | -| [demo-ureport2](./demo-ureport2) | spring-boot 集成 ureport2 实现复杂的自定义的中国式报表
待完成 | -| [demo-uflo](./demo-uflo) | spring-boot 集成 uflo 快速实现轻量级流程引擎
待完成 | -| [demo-urule](./demo-urule) | spring-boot 集成 urule 快速实现规则引擎
待完成 | -| [demo-activiti](./demo-activiti) | spring-boot 集成 activiti 7 流程引擎
待完成 | -| [demo-async](./demo-async) | spring-boot 使用原生提供的异步任务支持,实现异步执行任务 | -| [demo-war](./demo-war) | spring-boot 打成 war 包的配置 | -| [demo-elasticsearch](./demo-elasticsearch) | spring-boot 集成 ElasticSearch,集成 `spring-boot-starter-data-elasticsearch` 完成对 ElasticSearch 的高级使用技巧,包括创建索引、配置映射、删除索引、增删改查基本操作、复杂查询、高级查询、聚合查询等 | -| [demo-dubbo](./demo-dubbo) | spring-boot 集成 Dubbo,分别为公共模块 `spring-boot-demo-dubbo-common`、服务提供方`spring-boot-demo-dubbo-provider`、服务调用方`spring-boot-demo-dubbo-consumer` | -| [demo-mongodb](./demo-mongodb) | spring-boot 集成 MongoDB,使用官方的 starter 实现增删改查 | -| [demo-neo4j](./demo-neo4j) | spring-boot 集成 Neo4j 图数据库,实现一个校园人物关系网的demo | -| [demo-docker](./demo-docker) | spring-boot 容器化 | -| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | spring-boot 使用JPA集成多数据源 | +| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | spring-boot 集成 [mybatis-plus](https://mybatis.plus/),使用 [mybatis-plus-boot-starter](http://mp.baomidou.com/) 集成,集成 BaseMapper、BaseService、ActiveRecord 操作数据库 | +| [demo-orm-beetlsql](./demo-orm-beetlsql) | spring-boot 集成 [beetl-sql](http://ibeetl.com/guide/#beetlsql),使用 [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) 集成 | +| [demo-upload](./demo-upload) | spring-boot 文件上传示例,包含本地文件上传以及七牛云文件上传 | +| [demo-cache-redis](./demo-cache-redis) | spring-boot 整合 redis,操作redis中的数据,并使用redis缓存数据 | +| [demo-cache-ehcache](./demo-cache-ehcache) | spring-boot 整合 ehcache,使用 ehcache 缓存数据 | +| [demo-email](./demo-email) | spring-boot 整合 email,包括发送简单文本邮件、HTML邮件(包括模板HTML邮件)、附件邮件、静态资源邮件 | +| [demo-task](./demo-task) | spring-boot 快速实现定时任务 | +| [demo-task-quartz](./demo-task-quartz) | spring-boot 整合 quartz,并实现对定时任务的管理,包括新增定时任务,删除定时任务,暂停定时任务,恢复定时任务,修改定时任务启动时间,以及定时任务列表查询,`提供前端页面` | +| [demo-task-xxl-job](./demo-task-xxl-job) | spring-boot 整合[xxl-job](http://www.xuxueli.com/xxl-job/en/#/),并提供绕过 `xxl-job-admin` 对定时任务的管理的方法,包括定时任务列表,触发器列表,新增定时任务,删除定时任务,停止定时任务,启动定时任务,修改定时任务,手动触发定时任务 | +| [demo-swagger](./demo-swagger) | spring-boot 集成原生的 `swagger` 用于统一管理、测试 API 接口 | +| [demo-swagger-beauty](./demo-swagger-beauty) | spring-boot 集成第三方 `swagger` [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) 美化API文档样式,用于统一管理、测试 API 接口 | +| [demo-rbac-security](./demo-rbac-security) | spring-boot 集成 spring security 完成基于RBAC权限模型的权限管理,支持自定义过滤请求,动态权限认证,使用 JWT 安全认证,支持在线人数统计,手动踢出用户等操作 | +| [demo-rbac-shiro](./demo-rbac-shiro) | spring-boot 集成 shiro 实现权限管理
待完成 | +| [demo-session](./demo-session) | spring-boot 集成 Spring Session 实现Session共享、重启程序Session不失效 | +| [demo-oauth](./demo-oauth) | spring-boot 实现 oauth 服务器功能,实现授权码机制
待完成 | +| [demo-social](./demo-social) | spring-boot 集成第三方登录,集成 `justauth-spring-boot-starter` 实现QQ登录、GitHub登录、微信登录、谷歌登录、微软登录、小米登录、企业微信登录。 | +| [demo-zookeeper](./demo-zookeeper) | spring-boot 集成 Zookeeper 结合AOP实现分布式锁 | +| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | spring-boot 集成 RabbitMQ 实现基于直接队列模式、分列模式、主题模式、延迟队列的消息发送和接收 | +| [demo-mq-rocketmq](./demo-mq-rocketmq) | spring-boot 集成 RocketMQ,实现消息的发送和接收
待完成 | +| [demo-mq-kafka](./demo-mq-kafka) | spring-boot 集成 kafka,实现消息的发送和接收 | +| [demo-websocket](./demo-websocket) | spring-boot 集成 websocket,后端主动推送前端服务器运行信息 | +| [demo-websocket-socketio](./demo-websocket-socketio) | spring-boot 使用 netty-socketio 集成 websocket,实现一个简单的聊天室 | +| [demo-ureport2](./demo-ureport2) | spring-boot 集成 ureport2 实现复杂的自定义的中国式报表
待完成 | +| [demo-uflo](./demo-uflo) | spring-boot 集成 uflo 快速实现轻量级流程引擎
待完成 | +| [demo-urule](./demo-urule) | spring-boot 集成 urule 快速实现规则引擎
待完成 | +| [demo-activiti](./demo-activiti) | spring-boot 集成 activiti 7 流程引擎
待完成 | +| [demo-async](./demo-async) | spring-boot 使用原生提供的异步任务支持,实现异步执行任务 | +| [demo-war](./demo-war) | spring-boot 打成 war 包的配置 | +| [demo-elasticsearch](./demo-elasticsearch) | spring-boot 集成 ElasticSearch,集成 `spring-boot-starter-data-elasticsearch` 完成对 ElasticSearch 的高级使用技巧,包括创建索引、配置映射、删除索引、增删改查基本操作、复杂查询、高级查询、聚合查询等 | +| [demo-dubbo](./demo-dubbo) | spring-boot 集成 Dubbo,分别为公共模块 `spring-boot-demo-dubbo-common`、服务提供方`spring-boot-demo-dubbo-provider`、服务调用方`spring-boot-demo-dubbo-consumer` | +| [demo-mongodb](./demo-mongodb) | spring-boot 集成 MongoDB,使用官方的 starter 实现增删改查 | +| [demo-neo4j](./demo-neo4j) | spring-boot 集成 Neo4j 图数据库,实现一个校园人物关系网的demo | +| [demo-docker](./demo-docker) | spring-boot 容器化 | +| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | spring-boot 使用JPA集成多数据源 | | [demo-multi-datasource-mybatis](./demo-multi-datasource-mybatis) | spring-boot 使用Mybatis集成多数据源,使用 Mybatis-Plus 提供的开源解决方案实现 | -| [demo-sharding-jdbc](./demo-sharding-jdbc) | spring-boot 使用 `sharding-jdbc` 实现分库分表,同时ORM采用 Mybatis-Plus | -| [demo-tio](./demo-tio) | spring-boot 集成 tio 网络编程框架
待完成 | -| demo-grpc | spring-boot 集成grpc,配置tls/ssl,参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5)
待完成 | -| [demo-codegen](./demo-codegen) | spring-boot 集成 velocity 模板技术实现的代码生成器,简化开发 | -| [demo-graylog](./demo-graylog) | spring-boot 集成 graylog 实现日志统一收集 | -| demo-sso | spring-boot 集成 SSO 单点登录,参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12)
待完成 | -| [demo-ldap](./demo-ldap) | spring-boot 集成 LDAP,集成 `spring-boot-starter-data-ldap` 完成对 Ldap 的基本 CURD操作, 并给出以登录为实战的 API 示例,参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23),感谢 [@fxbin](https://github.com/fxbin) | -| [demo-dynamic-datasource](./demo-dynamic-datasource) | spring-boot 动态添加数据源、动态切换数据源 | -| [demo-ratelimit-guava](./demo-ratelimit-guava) | spring-boot 使用 Guava RateLimiter 实现单机版限流,保护 API | -| [demo-ratelimit-redis](./demo-ratelimit-redis) | spring-boot 使用 Redis + Lua 脚本实现分布式限流,保护 API | -| [demo-https](./demo-https) | spring-boot 集成 HTTPS | +| [demo-sharding-jdbc](./demo-sharding-jdbc) | spring-boot 使用 `sharding-jdbc` 实现分库分表,同时ORM采用 Mybatis-Plus | +| [demo-tio](./demo-tio) | spring-boot 集成 tio 网络编程框架
待完成 | +| demo-grpc | spring-boot 集成grpc,配置tls/ssl,参见[ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5)
待完成 | +| [demo-codegen](./demo-codegen) | spring-boot 集成 velocity 模板技术实现的代码生成器,简化开发 | +| [demo-graylog](./demo-graylog) | spring-boot 集成 graylog 实现日志统一收集 | +| demo-sso | spring-boot 集成 SSO 单点登录,参见 [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12)
待完成 | +| [demo-ldap](./demo-ldap) | spring-boot 集成 LDAP,集成 `spring-boot-starter-data-ldap` 完成对 Ldap 的基本 CURD操作, 并给出以登录为实战的 API 示例,参见 [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23),感谢 [@fxbin](https://github.com/fxbin) | +| [demo-dynamic-datasource](./demo-dynamic-datasource) | spring-boot 动态添加数据源、动态切换数据源 | +| [demo-ratelimit-guava](./demo-ratelimit-guava) | spring-boot 使用 Guava RateLimiter 实现单机版限流,保护 API | +| [demo-ratelimit-redis](./demo-ratelimit-redis) | spring-boot 使用 Redis + Lua 脚本实现分布式限流,保护 API | +| [demo-https](./demo-https) | spring-boot 集成 HTTPS | | [demo-elasticsearch-rest-high-level-client](./demo-elasticsearch-rest-high-level-client) | spring boot 集成 ElasticSearch 7.x 版本,使用官方 Rest High Level Client 操作 ES 数据 | -| [demo-flyway](./demo-flyway) | spring boot 集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制 | +| [demo-flyway](./demo-flyway) | spring boot 集成 Flyway,项目启动时初始化数据库表结构,同时支持数据库脚本版本控制 | +| [demo-ureport2](./demo-ureport2) | spring boot 集成 Ureport2,实现中国式复杂报表设计 | ### 感谢 From dc519fbc1d8acbfae3c10aab7b130c231d7d0ff7 Mon Sep 17 00:00:00 2001 From: "Yangkai.Shen" <237497819@qq.com> Date: Tue, 24 Nov 2020 16:54:33 +0800 Subject: [PATCH 16/16] =?UTF-8?q?:sparkles:=20spring-boot-demo-ureport2=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-ureport2/README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/demo-ureport2/README.md b/demo-ureport2/README.md index 02151c671..b95e8707c 100644 --- a/demo-ureport2/README.md +++ b/demo-ureport2/README.md @@ -246,7 +246,25 @@ oss: Ureport2 最新版本是 `2.2.9`,挺久没更新了,存在一个坑:在报表设计页打开一个已存在的报表设计文件时,可能会出现无法预览的情况,参考 ISSUE:https://github.com/youseries/ureport/issues/393 -注意:该可能性出现在报表设计文件中使用了条件属性的情况下,修复方法就是打开文件之后,重新配置条件属性,此处是坑,小伙伴使用时注意下就好,最好的方法就是避免使用条件属性。 +![无法预览](http://static.xkcoding.com/spring-boot-demo/ureport2/084852.png) + +解决办法: + +![image-20201124164953947](http://static.xkcoding.com/spring-boot-demo/ureport2/084954.png) + +条件表达式变成 `undefined`,这里需要注意的是,我们的 xml 文件是正常的,只不过是 ureport 解析的时候出错了。 + +![条件表达式](http://static.xkcoding.com/spring-boot-demo/ureport2/085114.png) + +点击编辑,重新选择表达式即可解决 + +![image-20201124165202295](http://static.xkcoding.com/spring-boot-demo/ureport2/085202.png) + +再次尝试预览 + +![斑马纹预览数据](http://static.xkcoding.com/spring-boot-demo/ureport2/085228.png) + +> 注意:该可能性出现在报表设计文件中使用了条件属性的情况下,修复方法就是打开文件之后,重新配置条件属性,此处是坑,小伙伴使用时注意下就好,最好的方法就是避免使用条件属性。 ## 3. 感谢