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] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=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")