From 25d7b61330f17dc131e3725340283a9b86097361 Mon Sep 17 00:00:00 2001 From: lzq Date: Wed, 27 Aug 2025 17:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 + .../njzscloud-common-cache/pom.xml | 40 + .../com/njzscloud/common/cache/Cache.java | 17 + .../com/njzscloud/common/cache/Caches.java | 30 + .../com/njzscloud/common/cache/DualCache.java | 75 + .../njzscloud/common/cache/FirstCache.java | 46 + .../com/njzscloud/common/cache/NoCache.java | 36 + .../njzscloud/common/cache/SecondCache.java | 103 + .../cache/config/CacheAutoConfiguration.java | 34 + .../common/cache/config/CacheProperties.java | 30 + .../main/resources/META-INF/spring.factories | 2 + .../njzscloud-common-core/pom.xml | 125 ++ .../common/core/ex/CliException.java | 25 + .../core/ex/ExceptionDepthComparator.java | 93 + .../common/core/ex/ExceptionMsg.java | 53 + .../common/core/ex/ExceptionType.java | 21 + .../njzscloud/common/core/ex/Exceptions.java | 77 + .../njzscloud/common/core/ex/ExpectData.java | 60 + .../njzscloud/common/core/ex/SysError.java | 26 + .../common/core/ex/SysException.java | 25 + .../common/core/ex/SysThrowable.java | 52 + .../common/core/fastjson/Fastjson.java | 139 ++ .../serializer/DictObjectDeserializer.java | 107 ++ .../serializer/DictObjectSerializer.java | 97 + .../common/core/http/HttpClient.java | 208 ++ .../http/HttpClientAutoConfiguration.java | 25 + .../common/core/http/HttpClientDecorator.java | 201 ++ .../core/http/HttpClientProperties.java | 62 + .../core/http/annotation/BodyParam.java | 23 + .../core/http/annotation/FormBodyParam.java | 32 + .../core/http/annotation/GetEndpoint.java | 28 + .../core/http/annotation/HeaderParam.java | 33 + .../core/http/annotation/JsonBodyParam.java | 21 + .../core/http/annotation/MultiBodyParam.java | 37 + .../core/http/annotation/PathParam.java | 34 + .../core/http/annotation/PostEndpoint.java | 28 + .../core/http/annotation/QueryParam.java | 32 + .../core/http/annotation/RemoteServer.java | 44 + .../core/http/annotation/XmlBodyParam.java | 21 + .../common/core/http/constant/HttpMethod.java | 8 + .../common/core/http/constant/Mime.java | 39 + .../interceptor/CompositeInterceptor.java | 47 + .../http/interceptor/RequestInterceptor.java | 11 + .../http/interceptor/ResponseInterceptor.java | 17 + .../http/processor/BodyParamProcessor.java | 7 + .../processor/DefaultBodyParamProcessor.java | 19 + .../DefaultFormBodyParamProcessor.java | 13 + .../DefaultHeaderParamProcessor.java | 13 + .../DefaultJsonBodyParamProcessor.java | 11 + .../DefaultMultiBodyParamProcessor.java | 13 + .../processor/DefaultPathParamProcessor.java | 13 + .../processor/DefaultQueryParamProcessor.java | 13 + .../DefaultXmlBodyParamProcessor.java | 11 + .../processor/FormBodyParamProcessor.java | 10 + .../http/processor/HeaderParamProcessor.java | 10 + .../processor/JsonBodyParamProcessor.java | 7 + .../processor/MultiBodyParamProcessor.java | 10 + .../http/processor/PathParamProcessor.java | 9 + .../http/processor/QueryParamProcessor.java | 10 + .../http/processor/XmlBodyParamProcessor.java | 7 + .../core/http/resolver/BodyParamResolver.java | 43 + .../http/resolver/FormBodyParamResolver.java | 97 + .../http/resolver/HeaderParamResolver.java | 92 + .../http/resolver/JsonBodyParamResolver.java | 41 + .../http/resolver/MultiBodyParamResolver.java | 141 ++ .../core/http/resolver/ParamResolver.java | 242 +++ .../core/http/resolver/PathParamResolver.java | 74 + .../http/resolver/QueryParamResolver.java | 92 + .../http/resolver/XmlBodyParamResolver.java | 41 + .../core/http/support/ParameterInfo.java | 10 + .../common/core/http/support/RequestInfo.java | 29 + .../core/http/support/ResponseInfo.java | 32 + .../core/http/support/ResponseResult.java | 97 + .../com/njzscloud/common/core/ienum/Dict.java | 70 + .../njzscloud/common/core/ienum/DictInt.java | 11 + .../njzscloud/common/core/ienum/DictStr.java | 10 + .../njzscloud/common/core/ienum/IEnum.java | 24 + .../common/core/jackson/Jackson.java | 229 +++ .../jackson/serializer/BigDecimalModule.java | 16 + .../serializer/BigDecimalSerializer.java | 22 + .../jackson/serializer/DictDeserializer.java | 102 + .../jackson/serializer/DictSerializer.java | 61 + .../core/jackson/serializer/LongModule.java | 15 + .../jackson/serializer/LongSerializer.java | 21 + .../core/jackson/serializer/TimeModule.java | 29 + .../com/njzscloud/common/core/thread/Q.java | 688 +++++++ .../common/core/thread/ThreadPool.java | 138 ++ .../core/thread/WindowBlockingQueue.java | 693 +++++++ .../com/njzscloud/common/core/tree/Tree.java | 137 ++ .../njzscloud/common/core/tree/TreeNode.java | 51 + .../njzscloud/common/core/tuple/Tuple2.java | 121 ++ .../njzscloud/common/core/tuple/Tuple3.java | 84 + .../njzscloud/common/core/tuple/Tuple4.java | 87 + .../njzscloud/common/core/utils/Globs.java | 195 ++ .../common/core/utils/GroupUtil.java | 625 ++++++ .../com/njzscloud/common/core/utils/Key.java | 41 + .../com/njzscloud/common/core/utils/R.java | 243 +++ .../njzscloud-common-email/pom.xml | 55 + .../njzscloud/common/email/MailMessage.java | 234 +++ .../common/email/util/EMailUtil.java | 98 + njzscloud-common/njzscloud-common-gen/pom.xml | 46 + .../common/gen/SysTplController.java | 94 + .../njzscloud/common/gen/SysTplEntity.java | 55 + .../njzscloud/common/gen/SysTplMapper.java | 12 + .../njzscloud/common/gen/SysTplService.java | 87 + .../gen/config/GenAutoConfiguration.java | 30 + .../common/gen/contant/TplCategory.java | 24 + .../com/njzscloud/common/gen/support/Btl.java | 40 + .../common/gen/support/DbMetaData.java | 73 + .../common/gen/support/Generator.java | 55 + .../common/gen/support/TemplateEngine.java | 75 + .../com/njzscloud/common/gen/support/Tpl.java | 26 + .../main/resources/META-INF/spring.factories | 2 + .../main/resources/templates/controller.btl | 74 + .../src/main/resources/templates/entity.btl | 56 + .../src/main/resources/templates/mapper.btl | 22 + .../main/resources/templates/mapper_xml.btl | 14 + .../src/main/resources/templates/service.btl | 69 + .../src/main/resources/templates/tpl.json | 10 + .../main/resources/templates/tpl_update.json | 8 + njzscloud-common/njzscloud-common-job/pom.xml | 56 + .../common/job/XxlAdminProperties.java | 26 + .../common/job/XxlExecutorProperties.java | 34 + .../common/job/XxlJobAutoConfiguration.java | 28 + .../common/job/XxlJobProperties.java | 15 + .../main/resources/META-INF/spring.factories | 2 + .../njzscloud-common-minio/pom.xml | 43 + .../minio/config/AliOSSAutoConfiguration.java | 38 + .../minio/config/MinioAutoConfiguration.java | 28 + .../common/minio/config/MinioProperties.java | 16 + .../minio/controller/OSSController.java | 53 + .../njzscloud/common/minio/util/AliOSS.java | 118 ++ .../njzscloud/common/minio/util/Minio.java | 164 ++ .../main/resources/META-INF/spring.factories | 2 + njzscloud-common/njzscloud-common-mp/pom.xml | 71 + .../mp/config/DBTunnelAutoConfiguration.java | 19 + .../common/mp/config/DbTunnelProperties.java | 34 + .../common/mp/config/MpAutoConfiguration.java | 42 + .../mp/config/MybatisPlusProperties.java | 14 + .../support/CustomDataPermissionHandler.java | 43 + .../njzscloud/common/mp/support/DBTunnel.java | 114 ++ .../mp/support/MetaObjectHandlerImpl.java | 51 + .../common/mp/support/PageParam.java | 65 + .../common/mp/support/PageResult.java | 46 + .../handler/e/EnumTypeHandlerDealer.java | 123 ++ .../mp/support/handler/j/JsonTypeHandler.java | 48 + .../main/resources/META-INF/spring.factories | 3 + njzscloud-common/njzscloud-common-mvc/pom.xml | 79 + .../mvc/config/MvcAutoConfiguration.java | 47 + ...appingHandlerAdapterAutoConfiguration.java | 72 + .../DictHandlerMethodArgumentResolver.java | 60 + .../support/GlobalExceptionController.java | 323 ++++ .../support/ReusableHttpServletRequest.java | 146 ++ .../mvc/support/ReusableRequestFilter.java | 17 + .../common/mvc/util/FileResponseUtil.java | 97 + .../common/mvc/validator/Constrained.java | 5 + .../common/mvc/validator/Constraint.java | 17 + .../mvc/validator/ConstraintValidator.java | 31 + .../common/mvc/validator/ValidRule.java | 22 + .../ws/config/WebsocketAutoConfiguration.java | 75 + .../mvc/ws/config/WebsocketProperties.java | 43 + .../ws/support/TokenHandshakeInterceptor.java | 43 + .../support/WebSocketChannelInterceptor.java | 47 + .../njzscloud/common/mvc/ws/util/WsUtil.java | 33 + .../main/resources/META-INF/spring.factories | 4 + .../njzscloud-common-redis/pom.xml | 58 + .../com/njzscloud/common/redis/RedisCli.java | 232 +++ .../njzscloud/common/redis/annotation/Eg.java | 38 + .../common/redis/annotation/RedisChannel.java | 33 + .../redis/annotation/RedisListener.java | 19 + .../redis/config/RedisOtherProperties.java | 22 + .../config/RedisServiceAutoConfiguration.java | 120 ++ .../redis/support/RedisFastjsonCodec.java | 63 + .../redis/support/RedisListenerRegistrar.java | 100 + .../redis/support/RedisMessageDispatch.java | 157 ++ .../njzscloud/common/redis/util/Redis.java | 759 ++++++++ .../main/resources/META-INF/spring.factories | 2 + .../njzscloud-common-security/pom.xml | 53 + .../config/WebSecurityAutoConfiguration.java | 161 ++ .../config/WebSecurityProperties.java | 24 + .../common/security/contant/AuthWay.java | 23 + .../common/security/contant/Constants.java | 33 + .../security/contant/EndpointAccessModel.java | 22 + .../security/ex/ForbiddenAccessException.java | 19 + .../ex/MissingPermissionException.java | 16 + .../security/ex/UserLoginException.java | 29 + .../handler/AccessDeniedExceptionHandler.java | 52 + .../handler/AuthExceptionHandler.java | 46 + .../security/handler/LoginPostHandler.java | 97 + .../security/handler/LogoutPostHandler.java | 54 + .../PasswordAuthenticationProvider.java | 62 + .../module/password/PasswordLoginForm.java | 42 + .../password/PasswordLoginPreparer.java | 45 + .../permission/DefaultPermissionManager.java | 24 + .../permission/PermissionManager.java | 177 ++ .../PermissionSecurityMetaDataSource.java | 48 + .../security/permission/PermissionVoter.java | 43 + .../security/permission/RolePermission.java | 35 + .../AbstractAuthenticationProvider.java | 135 ++ .../support/AuthenticationDetails.java | 55 + .../CombineAuthenticationConfigurer.java | 83 + .../support/CombineAuthenticationFilter.java | 143 ++ .../DefaultAuthenticationProvider.java | 21 + .../support/DefaultLoginHistoryRecorder.java | 16 + .../security/support/EndpointResource.java | 47 + .../security/support/IResourceService.java | 6 + .../common/security/support/IRoleService.java | 8 + .../security/support/ITokenService.java | 12 + .../common/security/support/IUserService.java | 5 + .../common/security/support/LoginForm.java | 20 + .../common/security/support/LoginHistory.java | 66 + .../support/LoginHistoryRecorder.java | 9 + .../security/support/LoginPreparer.java | 24 + .../common/security/support/MenuResource.java | 69 + .../common/security/support/Resource.java | 17 + .../common/security/support/Token.java | 109 ++ .../TokenSecurityContextRepository.java | 125 ++ .../security/support/TokenSerializer.java | 21 + .../support/UserAuthenticationToken.java | 72 + .../common/security/support/UserDetail.java | 110 ++ .../common/security/util/EncryptUtil.java | 64 + .../common/security/util/SecurityUtil.java | 81 + .../main/resources/META-INF/spring.factories | 2 + .../njzscloud-common-sichen/pom.xml | 38 + .../common/sichen/SysTaskEntity.java | 65 + .../common/sichen/SysTaskMapper.java | 12 + .../common/sichen/SysTaskService.java | 73 + .../sichen/config/TaskAutoConfiguration.java | 50 + .../common/sichen/config/TaskProperties.java | 27 + .../common/sichen/contant/ScheduleType.java | 17 + .../common/sichen/contant/TaskStatus.java | 20 + .../sichen/dispatcher/SichenScheduler.java | 130 ++ .../sichen/executor/SichenExecutor.java | 43 + .../common/sichen/support/Cable.java | 46 + .../common/sichen/support/CronExpression.java | 1670 +++++++++++++++++ .../njzscloud/common/sichen/support/Task.java | 19 + .../common/sichen/support/TaskHandle.java | 72 + .../common/sichen/support/TaskInfo.java | 48 + .../common/sichen/support/TaskStore.java | 107 ++ .../common/sichen/support/TaskUtil.java | 39 + .../main/resources/META-INF/spring.factories | 2 + njzscloud-common/njzscloud-common-sn/pom.xml | 42 + .../njzscloud/common/sn/AddSnConfigParam.java | 42 + .../common/sn/ModifySnConfigParam.java | 38 + .../njzscloud/common/sn/SysIncSnEntity.java | 61 + .../njzscloud/common/sn/SysIncSnMapper.java | 12 + .../njzscloud/common/sn/SysIncSnService.java | 77 + .../common/sn/SysSnConfigController.java | 86 + .../common/sn/SysSnConfigEntity.java | 47 + .../common/sn/SysSnConfigMapper.java | 12 + .../common/sn/SysSnConfigService.java | 120 ++ .../common/sn/config/SnAutoConfiguration.java | 30 + .../common/sn/config/SnProperties.java | 15 + .../njzscloud/common/sn/contant/PadMode.java | 21 + .../common/sn/contant/RandomMode.java | 21 + .../common/sn/contant/SnSection.java | 22 + .../common/sn/support/FixedSection.java | 13 + .../common/sn/support/FixedSectionConfig.java | 32 + .../common/sn/support/ISnSection.java | 5 + .../common/sn/support/IncSection.java | 30 + .../common/sn/support/IncSectionConfig.java | 50 + .../common/sn/support/RandomSection.java | 42 + .../sn/support/RandomSectionConfig.java | 53 + .../common/sn/support/SectionConfig.java | 15 + .../com/njzscloud/common/sn/support/Sn.java | 26 + .../njzscloud/common/sn/support/SnUtil.java | 47 + .../common/sn/support/TimeSection.java | 19 + .../common/sn/support/TimeSectionConfig.java | 45 + .../main/resources/META-INF/spring.factories | 2 + njzscloud-common/pom.xml | 32 + njzscloud-svr/pom.xml | 74 + .../java/com/njzscloud/supervisory/Main.java | 12 + .../auth/mapper/SysTokenMapper.java | 13 + .../supervisory/auth/pojo/SysTokenEntity.java | 50 + .../auth/service/SecurityService.java | 36 + .../auth/service/TokenService.java | 68 + .../dict/controller/SysDictController.java | 94 + .../controller/SysDictItemController.java | 81 + .../dict/mapper/SysDictItemMapper.java | 13 + .../dict/mapper/SysDictMapper.java | 13 + .../dict/pojo/ObtainDictDataResult.java | 60 + .../supervisory/dict/pojo/SysDictEntity.java | 44 + .../dict/pojo/SysDictItemEntity.java | 59 + .../dict/service/SysDictItemService.java | 77 + .../dict/service/SysDictService.java | 91 + .../controller/SysDistrictController.java | 87 + .../district/mapper/SysDistrictMapper.java | 32 + .../district/pojo/DistrictTreeResult.java | 64 + .../district/pojo/SysDistrictEntity.java | 65 + .../district/service/SysDistrictService.java | 84 + .../endpoint/contant/RequestMethod.java | 21 + .../controller/SysEndpointController.java | 81 + .../endpoint/mapper/SysEndpointMapper.java | 16 + .../endpoint/pojo/SysEndpointEntity.java | 85 + .../endpoint/service/SysEndpointService.java | 85 + .../menu/contant/MenuCategory.java | 21 + .../menu/controller/SysMenuController.java | 97 + .../menu/mapper/SysMenuMapper.java | 15 + .../supervisory/menu/pojo/MenuAddParam.java | 74 + .../menu/pojo/MenuDetailResult.java | 57 + .../menu/pojo/MenuModifyParam.java | 56 + .../menu/pojo/MenuSearchParam.java | 27 + .../supervisory/menu/pojo/SysMenuEntity.java | 100 + .../menu/service/SysMenuService.java | 199 ++ .../oss/controller/OSSController.java | 86 + .../cotroller/SysResourceController.java | 95 + .../resource/mapper/SysResourceMapper.java | 21 + .../resource/pojo/SysResourceEntity.java | 43 + .../resource/service/SysResourceService.java | 89 + .../role/controller/SysRoleController.java | 115 ++ .../role/mapper/SysRoleMapper.java | 31 + .../role/mapper/SysRoleResMapper.java | 13 + .../supervisory/role/pojo/RoleAddParam.java | 32 + .../role/pojo/RoleBindResourceParam.java | 24 + .../role/pojo/RoleDetailResult.java | 40 + .../role/pojo/RoleModifyParam.java | 34 + .../supervisory/role/pojo/RoleQueryParam.java | 21 + .../supervisory/role/pojo/SysRoleEntity.java | 70 + .../role/pojo/SysRoleResourceEntity.java | 49 + .../role/service/SysRoleResService.java | 77 + .../role/service/SysRoleService.java | 189 ++ .../supervisory/statistics/contant/.gitkeep | 0 .../controller/StatisticsController.java | 32 + .../statistics/mapper/StatisticsMapper.java | 29 + .../statistics/pojo/CarTrends.java | 18 + .../pojo/GarbageDisposeSummary.java | 18 + .../statistics/pojo/OrderAmountSummary.java | 18 + .../statistics/pojo/OrderInfo.java | 21 + .../statistics/pojo/OrderSummary.java | 21 + .../statistics/pojo/TodayOrderSummary.java | 17 + .../statistics/pojo/UserSummary.java | 20 + .../statistics/service/StatisticsService.java | 301 +++ .../tenant/contant/TenantStatus.java | 19 + .../controller/SysTenantController.java | 86 + .../tenant/mapper/SysTenantMapper.java | 13 + .../tenant/pojo/SysTenantEntity.java | 71 + .../tenant/service/SysTenantService.java | 77 + .../supervisory/test/contant/.gitkeep | 0 .../supervisory/test/controller/.gitkeep | 0 .../supervisory/test/mapper/.gitkeep | 0 .../njzscloud/supervisory/test/pojo/.gitkeep | 0 .../supervisory/test/service/.gitkeep | 0 .../supervisory/user/contant/Gender.java | 21 + .../user/controller/SysUserController.java | 106 ++ .../user/mapper/SysUserAccountMapper.java | 29 + .../user/mapper/SysUserMapper.java | 26 + .../user/mapper/SysUserRoleMapper.java | 18 + .../user/pojo/AddUserAccountParam.java | 68 + .../supervisory/user/pojo/AddUserParam.java | 51 + .../user/pojo/ModifyInfoParam.java | 23 + .../user/pojo/ModifyPasswdParam.java | 13 + .../supervisory/user/pojo/MyResult.java | 51 + .../user/pojo/ObtainInfoResult.java | 94 + .../user/pojo/SysUserAccountEntity.java | 108 ++ .../supervisory/user/pojo/SysUserEntity.java | 85 + .../user/pojo/SysUserRoleEntity.java | 35 + .../user/pojo/UserAccountDetailResult.java | 43 + .../user/pojo/UserAccountModifyParam.java | 68 + .../user/pojo/UserDetailResult.java | 47 + .../user/pojo/UserModifyParam.java | 49 + .../supervisory/user/pojo/UserQueryParam.java | 37 + .../user/pojo/UserRegisterParam.java | 201 ++ .../user/service/SysUserAccountService.java | 101 + .../user/service/SysUserRoleService.java | 76 + .../user/service/SysUserService.java | 248 +++ .../src/main/resources/application-dev.yml | 51 + .../src/main/resources/application-prod.yml | 53 + .../src/main/resources/application.yml | 74 + .../src/main/resources/logback-spring.xml | 37 + .../resources/mapper/StatisticsMapper.xml | 170 ++ .../resources/mapper/SysEndpointMapper.xml | 26 + .../main/resources/mapper/SysMenuMapper.xml | 26 + .../resources/mapper/SysResourceMapper.xml | 49 + .../main/resources/mapper/SysRoleMapper.xml | 29 + .../resources/mapper/SysUserAccountMapper.xml | 46 + .../main/resources/mapper/SysUserMapper.xml | 35 + .../resources/mapper/SysUserRoleMapper.xml | 18 + pom.xml | 201 ++ 378 files changed, 24724 insertions(+) create mode 100644 .gitignore create mode 100644 njzscloud-common/njzscloud-common-cache/pom.xml create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Cache.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Caches.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/DualCache.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/FirstCache.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/NoCache.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/SecondCache.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheProperties.java create mode 100644 njzscloud-common/njzscloud-common-cache/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-core/pom.xml create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/CliException.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionDepthComparator.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionMsg.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionType.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/Exceptions.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExpectData.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysError.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysException.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysThrowable.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/Fastjson.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectDeserializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectSerializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/Dict.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictInt.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictStr.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/IEnum.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/Jackson.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalModule.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalSerializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictDeserializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictSerializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongModule.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongSerializer.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/TimeModule.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/Q.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/WindowBlockingQueue.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/Tree.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/TreeNode.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple2.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple3.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple4.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Globs.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/GroupUtil.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Key.java create mode 100644 njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/R.java create mode 100644 njzscloud-common/njzscloud-common-email/pom.xml create mode 100644 njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java create mode 100644 njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/util/EMailUtil.java create mode 100644 njzscloud-common/njzscloud-common-gen/pom.xml create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplController.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplEntity.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplMapper.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplService.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/config/GenAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/contant/TplCategory.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Btl.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/DbMetaData.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Generator.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/TemplateEngine.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Tpl.java create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/controller.btl create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/entity.btl create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper.btl create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper_xml.btl create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/service.btl create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl.json create mode 100644 njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl_update.json create mode 100644 njzscloud-common/njzscloud-common-job/pom.xml create mode 100644 njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlAdminProperties.java create mode 100644 njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlExecutorProperties.java create mode 100644 njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobProperties.java create mode 100644 njzscloud-common/njzscloud-common-job/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-minio/pom.xml create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/AliOSSAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioProperties.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/controller/OSSController.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/AliOSS.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java create mode 100644 njzscloud-common/njzscloud-common-minio/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-mp/pom.xml create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DBTunnelAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DbTunnelProperties.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MpAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MybatisPlusProperties.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/CustomDataPermissionHandler.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/DBTunnel.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/MetaObjectHandlerImpl.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/e/EnumTypeHandlerDealer.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java create mode 100644 njzscloud-common/njzscloud-common-mp/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-mvc/pom.xml create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/MvcAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/RequestMappingHandlerAdapterAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/DictHandlerMethodArgumentResolver.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/GlobalExceptionController.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableRequestFilter.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/util/FileResponseUtil.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constrained.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constraint.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ConstraintValidator.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ValidRule.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketProperties.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/TokenHandshakeInterceptor.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/WebSocketChannelInterceptor.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/util/WsUtil.java create mode 100644 njzscloud-common/njzscloud-common-mvc/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-redis/pom.xml create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/RedisCli.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/Eg.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisChannel.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisListener.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisOtherProperties.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisServiceAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisFastjsonCodec.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisMessageDispatch.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/util/Redis.java create mode 100644 njzscloud-common/njzscloud-common-redis/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-security/pom.xml create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityProperties.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/AuthWay.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/Constants.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/EndpointAccessModel.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/ForbiddenAccessException.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/MissingPermissionException.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/UserLoginException.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordAuthenticationProvider.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginForm.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginPreparer.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/DefaultPermissionManager.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionManager.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionSecurityMetaDataSource.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionVoter.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/RolePermission.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AbstractAuthenticationProvider.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AuthenticationDetails.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationConfigurer.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationFilter.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultAuthenticationProvider.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultLoginHistoryRecorder.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/EndpointResource.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IResourceService.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IRoleService.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/ITokenService.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistory.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistoryRecorder.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginPreparer.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/MenuResource.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Resource.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Token.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSecurityContextRepository.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSerializer.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserAuthenticationToken.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserDetail.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/EncryptUtil.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/SecurityUtil.java create mode 100644 njzscloud-common/njzscloud-common-security/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-sichen/pom.xml create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskEntity.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskMapper.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskService.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskProperties.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/ScheduleType.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/TaskStatus.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/dispatcher/SichenScheduler.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/executor/SichenExecutor.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Cable.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/CronExpression.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Task.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskHandle.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskInfo.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskUtil.java create mode 100644 njzscloud-common/njzscloud-common-sichen/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/njzscloud-common-sn/pom.xml create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/AddSnConfigParam.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/ModifySnConfigParam.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnEntity.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnMapper.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnService.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigController.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigEntity.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigMapper.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigService.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnAutoConfiguration.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnProperties.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/PadMode.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/RandomMode.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/SnSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSectionConfig.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/ISnSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSectionConfig.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSectionConfig.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SectionConfig.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/Sn.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SnUtil.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSection.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSectionConfig.java create mode 100644 njzscloud-common/njzscloud-common-sn/src/main/resources/META-INF/spring.factories create mode 100644 njzscloud-common/pom.xml create mode 100644 njzscloud-svr/pom.xml create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/mapper/SysTokenMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/pojo/SysTokenEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/SecurityService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/TokenService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictItemController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictItemMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/ObtainDictDataResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictItemEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictItemService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/controller/SysDistrictController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/mapper/SysDistrictMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/DistrictTreeResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/SysDistrictEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/service/SysDistrictService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/contant/RequestMethod.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/controller/SysEndpointController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/mapper/SysEndpointMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/pojo/SysEndpointEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/service/SysEndpointService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/contant/MenuCategory.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/controller/SysMenuController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/mapper/SysMenuMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuAddParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuDetailResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuModifyParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuSearchParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/SysMenuEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/oss/controller/OSSController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/cotroller/SysResourceController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/mapper/SysResourceMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/pojo/SysResourceEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/service/SysResourceService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/controller/SysRoleController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleResMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleAddParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleBindResourceParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleDetailResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleModifyParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleQueryParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleResourceEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleResService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/contant/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/StatisticsController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/StatisticsMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/CarTrends.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderAmountSummary.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderInfo.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderSummary.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/TodayOrderSummary.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/UserSummary.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/StatisticsService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/contant/TenantStatus.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/controller/SysTenantController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/mapper/SysTenantMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/pojo/SysTenantEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/service/SysTenantService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/contant/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/controller/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/mapper/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/pojo/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/service/.gitkeep create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/contant/Gender.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/controller/SysUserController.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserAccountMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserRoleMapper.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserAccountParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyInfoParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyPasswdParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/MyResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ObtainInfoResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserAccountEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserRoleEntity.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountDetailResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountModifyParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserDetailResult.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserQueryParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserRegisterParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserAccountService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserRoleService.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java create mode 100644 njzscloud-svr/src/main/resources/application-dev.yml create mode 100644 njzscloud-svr/src/main/resources/application-prod.yml create mode 100644 njzscloud-svr/src/main/resources/application.yml create mode 100644 njzscloud-svr/src/main/resources/logback-spring.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysEndpointMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysMenuMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysResourceMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysRoleMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysUserAccountMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysUserMapper.xml create mode 100644 njzscloud-svr/src/main/resources/mapper/SysUserRoleMapper.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b894a45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/**/logs +/**/*.iml +/**/.idea +/**/target +/**/.DS_Store +/**/.xcodemap +/**/.back* diff --git a/njzscloud-common/njzscloud-common-cache/pom.xml b/njzscloud-common/njzscloud-common-cache/pom.xml new file mode 100644 index 0000000..3bdd6ce --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-cache + jar + + njzscloud-common-cache + + + 8 + 8 + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + + com.njzscloud + njzscloud-common-redis + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Cache.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Cache.java new file mode 100644 index 0000000..555c690 --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Cache.java @@ -0,0 +1,17 @@ +package com.njzscloud.common.cache; + +import java.util.function.Supplier; + +public interface Cache { + T get(String key); + + T get(String key, Supplier supplier); + + T get(String key, long timeout, Supplier supplier); + + void put(String key, Object value, long timeout); + + void put(String key, Object value); + + void remove(String key); +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Caches.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Caches.java new file mode 100644 index 0000000..57fc7ed --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/Caches.java @@ -0,0 +1,30 @@ +package com.njzscloud.common.cache; + +import cn.hutool.extra.spring.SpringUtil; + +import java.util.function.Supplier; + +public final class Caches { + + public static final Cache CACHE = SpringUtil.getBean(Cache.class); + + public static T get(String key) { + return CACHE.get(key); + } + + public static T get(String key, long timeout, Supplier supplier) { + return CACHE.get(key, timeout, supplier); + } + + public static void put(String key, Object value, long timeout) { + CACHE.put(key, value, timeout); + } + + public static void put(String key, Object value) { + CACHE.put(key, value); + } + + public static void remove(String key) { + CACHE.remove(key); + } +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/DualCache.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/DualCache.java new file mode 100644 index 0000000..89e56e6 --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/DualCache.java @@ -0,0 +1,75 @@ +package com.njzscloud.common.cache; + +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.function.Supplier; + +public class DualCache implements Cache { + private final FirstCache FIRST_CACHE; + private final SecondCache SECOND_CACHE; + private final ReentrantReadWriteLock DUAL_CACHE_LOCK = new ReentrantReadWriteLock(); + + public DualCache(int capacity, long firstTimeout, long secondTimeout) { + FIRST_CACHE = new FirstCache(capacity, firstTimeout); + SECOND_CACHE = new SecondCache(secondTimeout); + } + + public T get(String key) { + DUAL_CACHE_LOCK.readLock().lock(); + try { + return FIRST_CACHE.get(key, () -> SECOND_CACHE.get(key)); + } finally { + DUAL_CACHE_LOCK.readLock().unlock(); + } + } + + public T get(String key, Supplier supplier) { + DUAL_CACHE_LOCK.readLock().lock(); + try { + return (T) FIRST_CACHE.get(key, () -> SECOND_CACHE.get(key, supplier)); + } finally { + DUAL_CACHE_LOCK.readLock().unlock(); + } + } + + @Override + public T get(String key, long timeout, Supplier supplier) { + DUAL_CACHE_LOCK.readLock().lock(); + try { + return (T) FIRST_CACHE.get(key, timeout, () -> SECOND_CACHE.get(key, timeout, supplier)); + } finally { + DUAL_CACHE_LOCK.readLock().unlock(); + } + } + + public void put(String key, Object value) { + DUAL_CACHE_LOCK.writeLock().lock(); + try { + FIRST_CACHE.put(key, value); + SECOND_CACHE.put(key, value); + } finally { + DUAL_CACHE_LOCK.writeLock().unlock(); + } + } + + public void put(String key, Object value, long timeout) { + DUAL_CACHE_LOCK.writeLock().lock(); + try { + FIRST_CACHE.put(key, value); + SECOND_CACHE.put(key, value, timeout); + } finally { + DUAL_CACHE_LOCK.writeLock().unlock(); + } + } + + public void remove(String key) { + DUAL_CACHE_LOCK.writeLock().lock(); + try { + FIRST_CACHE.remove(key); + SECOND_CACHE.remove(key); + } finally { + DUAL_CACHE_LOCK.writeLock().unlock(); + } + } +} + + diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/FirstCache.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/FirstCache.java new file mode 100644 index 0000000..68c095e --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/FirstCache.java @@ -0,0 +1,46 @@ +package com.njzscloud.common.cache; + +import cn.hutool.cache.CacheUtil; +import cn.hutool.cache.impl.LFUCache; + +import java.util.function.Supplier; + +@SuppressWarnings("unchecked") +public class FirstCache implements Cache { + private final LFUCache CACHE; + + public FirstCache(int capacity, long timeout) { + CACHE = CacheUtil.newLFUCache(capacity, timeout); + CacheUtil.newNoCache().get("first", null); + } + + @Override + public T get(String key) { + return (T) CACHE.get(key); + } + + public T get(String key, Supplier supplier) { + return (T) CACHE.get(key, supplier::get); + } + + @Override + public T get(String key, long timeout, Supplier supplier) { + return (T) CACHE.get(key, true, timeout, supplier::get); + } + + @Override + public void put(String key, Object value, long timeout) { + CACHE.put(key, value, timeout); + } + + @Override + public void put(String key, Object value) { + CACHE.put(key, value); + } + + @Override + public void remove(String key) { + CACHE.remove(key); + } + +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/NoCache.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/NoCache.java new file mode 100644 index 0000000..81927f4 --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/NoCache.java @@ -0,0 +1,36 @@ +package com.njzscloud.common.cache; + +import java.util.function.Supplier; + +public class NoCache implements Cache { + + public NoCache() { + } + + @Override + public T get(String key) { + return null; + } + + public T get(String key, Supplier supplier) { + return supplier.get(); + } + + @Override + public T get(String key, long timeout, Supplier supplier) { + return supplier.get(); + } + + @Override + public void put(String key, Object value, long timeout) { + } + + @Override + public void put(String key, Object value) { + } + + @Override + public void remove(String key) { + } + +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/SecondCache.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/SecondCache.java new file mode 100644 index 0000000..d08a540 --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/SecondCache.java @@ -0,0 +1,103 @@ +package com.njzscloud.common.cache; + +import com.njzscloud.common.redis.util.Redis; +import io.lettuce.core.SetArgs; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.function.Supplier; + +@SuppressWarnings("unchecked") +public class SecondCache implements Cache { + + private final ConcurrentHashMap LOCKS = new ConcurrentHashMap<>(); + private final long timeout; + + public SecondCache(long timeout) { + this.timeout = timeout; + } + + + public T get(String key) { + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.readLock().lock(); + try { + return Redis.get(key); + } finally { + LOCKS.remove(key); + lock.readLock().unlock(); + } + } + + @Override + public T get(String key, Supplier supplier) { + Object o = Redis.get(key); + if (o != null) return (T) o; + + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.writeLock().lock(); + try { + o = Redis.get(key); + if (o != null) return (T) o; + o = supplier.get(); + if (o != null) Redis.set(key, o); + return (T) o; + } finally { + LOCKS.remove(key); + lock.writeLock().unlock(); + } + } + + @Override + public T get(String key, long timeout, Supplier supplier) { + Object o = Redis.get(key); + if (o != null) return (T) o; + + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.writeLock().lock(); + try { + o = Redis.get(key); + if (o != null) return (T) o; + o = supplier.get(); + if (o != null) Redis.set(key, o, new SetArgs().ex(timeout)); + return (T) o; + } finally { + LOCKS.remove(key); + lock.writeLock().unlock(); + } + } + + public void put(String key, Object value, long timeout) { + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.writeLock().lock(); + try { + Redis.set(key, value, new SetArgs().ex(timeout)); + } finally { + LOCKS.remove(key); + lock.writeLock().unlock(); + } + } + + public void put(String key, Object value) { + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.writeLock().lock(); + try { + if (timeout > 0) Redis.set(key, value, new SetArgs().ex(timeout)); + else Redis.set(key, value); + } finally { + LOCKS.remove(key); + lock.writeLock().unlock(); + } + } + + public void remove(String key) { + ReentrantReadWriteLock lock = LOCKS.computeIfAbsent(key, k -> new ReentrantReadWriteLock()); + lock.writeLock().lock(); + try { + Redis.del(key); + } finally { + LOCKS.remove(key); + lock.writeLock().unlock(); + } + } +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheAutoConfiguration.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheAutoConfiguration.java new file mode 100644 index 0000000..48edecf --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheAutoConfiguration.java @@ -0,0 +1,34 @@ +package com.njzscloud.common.cache.config; + +import com.njzscloud.common.cache.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Slf4j +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(CacheProperties.class) +public class CacheAutoConfiguration { + + @Bean + public Cache cache(CacheProperties properties) { + CacheProperties.FirstCacheProperties first = properties.getFirst(); + CacheProperties.SecondCacheProperties second = properties.getSecond(); + Cache cache; + if (first.isEnabled()) { + if (second.isEnabled()) { + cache = new DualCache(first.getCapacity(), first.getTimeout(), second.getTimeout()); + } else { + cache = new FirstCache(first.getCapacity(), first.getTimeout()); + } + } else { + if (second.isEnabled()) { + cache = new SecondCache(second.getTimeout()); + } else { + cache = new NoCache(); + } + } + return cache; + } +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheProperties.java b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheProperties.java new file mode 100644 index 0000000..15d6114 --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/java/com/njzscloud/common/cache/config/CacheProperties.java @@ -0,0 +1,30 @@ +package com.njzscloud.common.cache.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties(prefix = "cache") +public class CacheProperties { + + private FirstCacheProperties first = new FirstCacheProperties(); + + private SecondCacheProperties second = new SecondCacheProperties(); + + @Getter + @Setter + public static class FirstCacheProperties { + private boolean enabled = true; + private int capacity = 100000; + private long timeout = 3600 * 24; + } + + @Getter + @Setter + public static class SecondCacheProperties { + private boolean enabled = false; + private long timeout = 3600 * 24; + } +} diff --git a/njzscloud-common/njzscloud-common-cache/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-cache/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..2d68baf --- /dev/null +++ b/njzscloud-common/njzscloud-common-cache/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.cache.config.CacheAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-core/pom.xml b/njzscloud-common/njzscloud-common-core/pom.xml new file mode 100644 index 0000000..37e4aef --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-core + + + 8 + 8 + UTF-8 + + + + + + com.alibaba + easyexcel + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + + cn.hutool + hutool-cache + + + cn.hutool + hutool-core + + + cn.hutool + hutool-extra + + + cn.hutool + hutool-captcha + + + cn.hutool + hutool-crypto + + + + + + cglib + cglib + + + + + com.squareup.okhttp3 + okhttp + + + + + org.projectlombok + lombok + + + + + org.slf4j + slf4j-api + + + + + ch.qos.logback + logback-classic + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/CliException.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/CliException.java new file mode 100644 index 0000000..2a8746e --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/CliException.java @@ -0,0 +1,25 @@ +package com.njzscloud.common.core.ex; + +import cn.hutool.core.util.StrUtil; + +/** + * 客户端异常, 表示客户端参错误 + */ +public class CliException extends SysThrowable { + /** + * 创建异常 + * + * @param cause 源异常 + * @param expect 期望响应值 + * @param msg 异常信息（简明） + * @param message 异常信息（详细） + */ + protected CliException(Throwable cause, Object expect, ExceptionMsg msg, Object message) { + super(cause, expect, msg, message); + } + + @Override + public String getMessage() { + return StrUtil.format("客户端错误, 错误码: {}, 错误信息: {}, 详细信息: {}", this.msg.code, this.msg.msg, this.message); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionDepthComparator.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionDepthComparator.java new file mode 100644 index 0000000..a16a861 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionDepthComparator.java @@ -0,0 +1,93 @@ +package com.njzscloud.common.core.ex; + + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.SimpleCache; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; + +/** + *

用于两个异常之间的排序

+ *

根据当前异常与目标异常在异常继承体系中的层级进行比较

+ * + * @see org.springframework.core.ExceptionDepthComparator + */ +public class ExceptionDepthComparator implements Comparator> { + + /** + * 比较器缓存 + */ + private static final SimpleCache, ExceptionDepthComparator> CACHE = new SimpleCache<>(); + + /** + * 目标异常类型 + */ + private final Class targetException; + + /** + * 创建异常比较器 + * + * @param exception 目标异常 + */ + public ExceptionDepthComparator(Throwable exception) { + Assert.notNull(exception, "目标异常不能为空"); + this.targetException = exception.getClass(); + } + + /** + * 创建异常比较器 + * + * @param exceptionType 目标异常类型 + */ + public ExceptionDepthComparator(Class exceptionType) { + Assert.notNull(exceptionType, "目标异常类型不能为空"); + this.targetException = exceptionType; + } + + /** + * 从给定异常中获取最接近目标异常的匹配项 + * + * @param exceptionTypes 待匹配的异常列表 + * @param targetException 目标异常 + * @return 匹配到的异常 + */ + public static Class findClosestMatch(Collection> exceptionTypes, Throwable targetException) { + Assert.notEmpty(exceptionTypes, "不能为空"); + Assert.notNull(targetException, "不能为空"); + if (exceptionTypes.size() == 1) { + return exceptionTypes.iterator().next(); + } + List> handledExceptions = new ArrayList<>(exceptionTypes); + ExceptionDepthComparator comparator = CACHE.get(targetException.getClass(), () -> new ExceptionDepthComparator(targetException)); + handledExceptions.sort(comparator); + return handledExceptions.get(0); + } + + @Override + public int compare(Class o1, Class o2) { + int depth1 = getDepth(o1, this.targetException); + int depth2 = getDepth(o2, this.targetException); + return depth1 - depth2; + } + + /** + * 获取异常的层级深度 + * + * @param declaredException 待匹配的异常 + * @param exceptionToMatch 目标异常 + * @return 深度（≥0），越近数字越小 + */ + private int getDepth(Class declaredException, Class exceptionToMatch) { + int depth = 0; + do { + if (exceptionToMatch.equals(declaredException)) return depth; + if (exceptionToMatch == Throwable.class) return Integer.MAX_VALUE; + depth++; + exceptionToMatch = exceptionToMatch.getSuperclass(); + } while (true); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionMsg.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionMsg.java new file mode 100644 index 0000000..c9cbebc --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionMsg.java @@ -0,0 +1,53 @@ +package com.njzscloud.common.core.ex; + + +/** + * 异常信息 + *

默认：

+ *

系统异常：SYS_EXP_MSG

+ *

客户端错误：CLI_ERR_MSG

+ *

系统错误：SYS_ERR_MSG

+ */ +public final class ExceptionMsg { + + /** + * 通用系统异常 + */ + public static final ExceptionMsg SYS_EXP_MSG = new ExceptionMsg(ExceptionType.SYS_EXP, 1111, "操作失败"); + + /** + * 通用客户端错误 + */ + public static final ExceptionMsg CLI_ERR_MSG = new ExceptionMsg(ExceptionType.CLI_ERR, 5555, "操作失败"); + + /** + * 通用系统错误 + */ + public static final ExceptionMsg SYS_ERR_MSG = new ExceptionMsg(ExceptionType.SYS_ERR, 9999, "系统错误"); + + /** + * 编号（0< code ≤9999） + */ + public final int code; + /** + * 异常信息（应尽量简略） + */ + public final String msg; + /** + * 异常类型 {@link ExceptionType} + */ + public final ExceptionType type; + + /** + * 创建异常信息 + * + * @param type 异常类型 {@link ExceptionType} + * @param code 异常编号（0< code ≤9999） + * @param msg 异常信息（应尽量简略） + */ + private ExceptionMsg(ExceptionType type, int code, String msg) { + this.code = code; + this.type = type; + this.msg = msg; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionType.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionType.java new file mode 100644 index 0000000..3615dfb --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExceptionType.java @@ -0,0 +1,21 @@ +package com.njzscloud.common.core.ex; + +import lombok.RequiredArgsConstructor; + +/** + * 异常类型 + */ +@RequiredArgsConstructor +public enum ExceptionType { + + SYS_EXP(1, "系统异常"), + + CLI_ERR(5, "客户端错误"), + + SYS_ERR(9, "系统错误"); + + public final int code; + + public final String name; + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/Exceptions.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/Exceptions.java new file mode 100644 index 0000000..3643126 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/Exceptions.java @@ -0,0 +1,77 @@ +package com.njzscloud.common.core.ex; + +import cn.hutool.core.util.StrUtil; + +/** + * 异常工具类 + * 创建异常对象 + */ +public class Exceptions { + + public static SysThrowable clierr(Object message, Object... param) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.CLI_ERR_MSG, message, param); + } + + public static SysThrowable clierr(Object message) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.CLI_ERR_MSG, message, null); + } + + public static SysThrowable exception(Object message, Object... param) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.SYS_EXP_MSG, message, param); + } + + public static SysThrowable exception(Object message) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.SYS_EXP_MSG, message, null); + } + + public static SysThrowable error(Object message, Object... param) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.SYS_ERR_MSG, message, param); + } + + public static SysThrowable error(Object message) { + return build(null, ExpectData.NULL_DATA, ExceptionMsg.SYS_ERR_MSG, message, null); + } + + public static SysThrowable error(Throwable cause, Object message, Object... param) { + return build(cause, ExpectData.NULL_DATA, ExceptionMsg.SYS_ERR_MSG, message, param); + } + + public static SysThrowable error(Throwable cause, Object message) { + return build(cause, ExpectData.NULL_DATA, ExceptionMsg.SYS_ERR_MSG, message, null); + } + + /** + *

创建异常对象

+ * + * @param cause 嵌套异常 + * @param expect 期望值 + * @param msg 异常信息 + * @param message 详细信息(字符串模板, 占位符: {}) + * @param param 模板参数 + * @see SysThrowable + * @see ExceptionMsg + * @see ExpectData + */ + private static SysThrowable build(Throwable cause, ExpectData expect, ExceptionMsg msg, Object message, Object[] param) { + + if (message instanceof String + && !StrUtil.isBlank((String) message) + && param != null + && param.length > 0) { + message = StrUtil.format((String) message, param); + } + + SysThrowable sysThrowable; + + if (msg.type == ExceptionType.SYS_EXP) { + sysThrowable = new SysException(cause, expect, msg, message); + } else if (msg.type == ExceptionType.CLI_ERR) { + sysThrowable = new CliException(cause, expect, msg, message); + } else { + sysThrowable = new SysError(cause, expect, msg, message); + } + + return sysThrowable; + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExpectData.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExpectData.java new file mode 100644 index 0000000..b1f8be2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/ExpectData.java @@ -0,0 +1,60 @@ +package com.njzscloud.common.core.ex; + +import lombok.AllArgsConstructor; + +import java.util.Collections; + +/** + * 期望值 + *

HTTP 响应时 响应体的 JSON 内容

+ */ +@AllArgsConstructor +public enum ExpectData { + + /** + * 响应: null + */ + NULL_DATA(null), + + /** + * 响应: [] + */ + ARR_DATA(Collections.emptyList()), + + /** + * 响应: {} + */ + KV_DATA(Collections.emptyMap()), + + /** + * 响应: "" + */ + STR_BLANK_DATA(""), + + /** + * 响应: 0 + */ + NUM_ZERO_DATA(0), + + /** + * 响应: false + */ + BOOL_FALSE_DATA(Boolean.FALSE), + + /** + * 响应: true + */ + BOOL_TRUE_DATA(Boolean.TRUE), + + /** + * 无响应体 + */ + VOID_DATA(Void.TYPE); + + private final Object data; + + @SuppressWarnings("unchecked") + public T getData() { + return (T) data; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysError.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysError.java new file mode 100644 index 0000000..ca6b3df --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysError.java @@ -0,0 +1,26 @@ +package com.njzscloud.common.core.ex; + +import cn.hutool.core.util.StrUtil; + +/** + * 系统错误, 此类异常无法处理或不应该处理 + */ +public class SysError extends SysThrowable { + /** + * 创建异常 + * + * @param cause 源异常 + * @param expect 期望响应值 + * @param msg 异常信息（简明） + * @param message 异常信息（详细） + */ + protected SysError(Throwable cause, Object expect, ExceptionMsg msg, Object message) { + super(cause, expect, msg, message); + } + + + @Override + public String getMessage() { + return StrUtil.format("内部服务错误, 错误码: {}, 错误信息: {}, 详细信息: {}", this.msg.code, this.msg.msg, this.message); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysException.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysException.java new file mode 100644 index 0000000..64f1e98 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysException.java @@ -0,0 +1,25 @@ +package com.njzscloud.common.core.ex; + +import cn.hutool.core.util.StrUtil; + +/** + * 系统异常, 表示可预料的错误或可预料的情况 + */ +public class SysException extends SysThrowable { + /** + * 创建异常 + * + * @param cause 源异常 + * @param expect 期望响应值 + * @param msg 异常信息（简明） + * @param message 异常信息（详细） + */ + protected SysException(Throwable cause, Object expect, ExceptionMsg msg, Object message) { + super(cause, expect, msg, message); + } + + @Override + public String getMessage() { + return StrUtil.format("系统异常, 错误码: {}, 错误信息: {}, 详细信息: {}", this.msg.code, this.msg.msg, this.message); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysThrowable.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysThrowable.java new file mode 100644 index 0000000..1e9eb7b --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ex/SysThrowable.java @@ -0,0 +1,52 @@ +package com.njzscloud.common.core.ex; + +import cn.hutool.core.map.MapUtil; +import com.njzscloud.common.core.jackson.Jackson; + +/** + * 系统异常 + */ +public abstract class SysThrowable extends RuntimeException { + + /** + * 希望值 + * + * @see ExpectData + */ + public final Object expect; + + /** + * 异常信息(简略) + */ + public final ExceptionMsg msg; + + /** + * 异常信息(详细) + */ + public final Object message; + + /** + * 创建异常 + * + * @param cause 源异常 + * @param expect 期望响应值 + * @param msg 异常信息（简明） + * @param message 异常信息（详细） + */ + protected SysThrowable(Throwable cause, Object expect, ExceptionMsg msg, Object message) { + super(msg.msg, cause); + this.msg = msg; + this.message = message == null ? "" : message; + this.expect = expect; + } + + @Override + public String toString() { + return Jackson.toJsonStr(MapUtil.builder() + .put("code", msg.code) + .put("expect", expect) + .put("msg", msg.msg) + .put("message", message) + .build()); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/Fastjson.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/Fastjson.java new file mode 100644 index 0000000..757d4eb --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/Fastjson.java @@ -0,0 +1,139 @@ +package com.njzscloud.common.core.fastjson; + +import cn.hutool.core.date.DatePattern; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONException; +import com.alibaba.fastjson2.JSONReader; +import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson2.filter.Filter; +import com.alibaba.fastjson2.filter.ValueFilter; +import com.alibaba.fastjson2.reader.ObjectReader; +import lombok.extern.slf4j.Slf4j; + +import java.io.InputStream; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; + +import static com.alibaba.fastjson2.JSONReader.Feature.IgnoreCheckClose; + +/** + *

Fastjson 工具

+ *

已开启类型序列化/反序列化支持

+ */ +@Slf4j +public class Fastjson { + private static final JSONWriter.Context JSON_WRITER_CONTEXT; + private static final JSONReader.Context JSON_READER_CONTEXT; + + static { + JSON_WRITER_CONTEXT = new JSONWriter.Context( + JSONWriter.Feature.WriteNulls, // 序列化输出空值字段 + JSONWriter.Feature.BrowserCompatible, // 在大范围超过JavaScript支持的整数，输出为字符串格式 + JSONWriter.Feature.WriteClassName, // 序列化时输出类型信息 + JSONWriter.Feature.PrettyFormat, // 格式化输出 + JSONWriter.Feature.SortMapEntriesByKeys, // 对Map中的KeyValue按照Key做排序后再输出。在有些验签的场景需要使用这个Feature + JSONWriter.Feature.WriteBigDecimalAsPlain, // 序列化BigDecimal使用toPlainString，避免科学计数法 + JSONWriter.Feature.WriteNullListAsEmpty, // 将List类型字段的空值序列化输出为空数组"[]" + JSONWriter.Feature.WriteNullStringAsEmpty, // 将String类型字段的空值序列化输出为空字符串"" + JSONWriter.Feature.WriteLongAsString // 将 Long 作为字符串输出 + ); + + ZoneId zoneId = ZoneId.of("GMT+8"); + + JSON_WRITER_CONTEXT.setZoneId(zoneId); + JSON_WRITER_CONTEXT.setDateFormat(DatePattern.NORM_DATETIME_PATTERN); + + JSON_WRITER_CONTEXT.configFilter((ValueFilter) (object, name, value) -> { + if (value != null) { + Class clazz = value.getClass(); + if (clazz == LocalDate.class) { + return DateTimeFormatter.ofPattern(DatePattern.PURE_DATE_PATTERN).withZone(zoneId).format((LocalDate) value); + } else if (clazz == LocalTime.class) { + return DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN).withZone(zoneId).format((LocalTime) value); + } else if (clazz == BigDecimal.class) { + return ((BigDecimal) value).toPlainString(); + } + } + return value; + }); + JSON_READER_CONTEXT = new JSONReader.Context( + JSONReader.Feature.IgnoreSetNullValue, // 忽略输入为null的字段 + JSONReader.Feature.SupportAutoType // 支持自动类型，要读取带"@type"类型信息的JSON数据，需要显示打开SupportAutoType + ); + JSON_READER_CONTEXT.setZoneId(zoneId); + JSON_READER_CONTEXT.setDateFormat(DatePattern.NORM_DATETIME_PATTERN); + } + + /** + * 序列化为 JSON 字符串 + * + * @param object 数据 + * @return String + * @see JSON#toJSONString(Object, JSONWriter.Context) + */ + public static String toJsonStr(Object object) { + return JSON.toJSONString(object, JSON_WRITER_CONTEXT); + } + + /** + * 序列化为 JSON 字节数组 + * + * @param object 数据 + * @return byte[] + * @see JSON#toJSONBytes(Object, Filter...) + */ + public static byte[] toJsonBytes(Object object) { + return JSON.toJSONBytes(object, StandardCharsets.UTF_8, JSON_WRITER_CONTEXT); + } + + /** + * 反序列化 + * + * @param json JSON 字符串 + * @param type 类型 + * @return T + * @see JSON#parseObject(String, Class, JSONReader.Context) + */ + @SuppressWarnings("unchecked") + public static T toBean(String json, Type type) { + if (json == null || json.isEmpty()) { + return null; + } + return toBean(JSONReader.of(json, JSON_READER_CONTEXT), type); + } + + public static T toBean(InputStream json, Type type) { + if (json == null) { + return null; + } + return toBean(JSONReader.of(json, StandardCharsets.UTF_8, JSON_READER_CONTEXT), type); + + } + + public static T toBean(byte[] json, Type type) { + if (json == null || json.length == 0) { + return null; + } + return toBean(JSONReader.of(json, JSON_READER_CONTEXT), type); + } + + @SuppressWarnings("unchecked") + private static T toBean(JSONReader reader, Type type) { + ObjectReader objectReader = JSON_READER_CONTEXT.getObjectReader(type); + try { + T object = objectReader.readObject(reader, type, null, 0); + reader.handleResolveTasks(object); + if (!reader.isEnd() && (JSON_READER_CONTEXT.getFeatures() & IgnoreCheckClose.mask) == 0) { + throw new JSONException(reader.info("input not end")); + } + return object; + } finally { + reader.close(); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectDeserializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectDeserializer.java new file mode 100644 index 0000000..548f665 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectDeserializer.java @@ -0,0 +1,107 @@ +package com.njzscloud.common.core.fastjson.serializer; + + +import com.alibaba.fastjson2.JSONReader; +import com.alibaba.fastjson2.reader.ObjectReader; +import com.alibaba.fastjson2.util.TypeUtils; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import com.njzscloud.common.core.ienum.IEnum; +import lombok.extern.slf4j.Slf4j; + +import java.lang.reflect.Type; +import java.util.Map; + +/** + * Dict 枚举的 Fastjson 反序列化器
+ * 使用方式（二选一即可）:
+ * 1、在字段上使用 JSONField 进行指定
+ * 如，@JSONField(deserializeUsing = DictObjectSerializer.class)
+ * 2、在枚举类上使用 JSONType 进行指定（在接口上指定无效）
+ * 如，@JSONType(writeEnumAsJavaBean = true, deserializer = DictObjectSerializer.class)

+ * JSON 格式见对应的序列化器 {@link DictObjectSerializer} + * + * @see Dict + * @see DictInt + * @see DictStr + * @see DictObjectSerializer + */ +@Slf4j +public class DictObjectDeserializer implements ObjectReader { + + private static final ClassLoader CLASSLOADER = DictObjectDeserializer.class.getClassLoader(); + + @Override + public Dict readObject(JSONReader jsonReader, Type fieldType, Object fieldName, long features) { + try { + if (jsonReader.isObject()) { + Map map = jsonReader.readObject(); + + String typeField = (String) map.get(IEnum.ENUM_TYPE); + Object valField = map.get(Dict.ENUM_VAL); + + + Class clazz = CLASSLOADER.loadClass(typeField); + + if (valField instanceof String) { + if (DictStr.class.isAssignableFrom(clazz)) { + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse((String) valField, constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(Integer.parseInt((String) valField), constants); + } else { + return null; + } + } else if (valField instanceof Integer) { + if (DictStr.class.isAssignableFrom(clazz)) { + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(String.valueOf(valField), constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse((Integer) valField, constants); + } else { + return null; + } + } else { + return null; + } + } else { + if (jsonReader.isString()) { + Class clazz = TypeUtils.getClass(fieldType); + if (DictStr.class.isAssignableFrom(clazz)) { + String val = jsonReader.readString(); + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + String val = jsonReader.readString(); + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(Integer.parseInt(val), constants); + } else { + return null; + } + } else if (jsonReader.isInt()) { + Class clazz = TypeUtils.getClass(fieldType); + if (DictStr.class.isAssignableFrom(clazz)) { + String val = jsonReader.readString(); + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + Integer val = jsonReader.readInt32(); + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else { + return null; + } + } else { + return null; + } + } + } catch (Exception e) { + log.error("字典枚举反序列化失败", e); + throw Exceptions.error(e, "字典枚举反序列化失败，类型：{}，字段名：{}", fieldType, fieldName); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectSerializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectSerializer.java new file mode 100644 index 0000000..38f1ce2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/fastjson/serializer/DictObjectSerializer.java @@ -0,0 +1,97 @@ +package com.njzscloud.common.core.fastjson.serializer; + +import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson2.util.TypeUtils; +import com.alibaba.fastjson2.writer.ObjectWriter; +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import com.njzscloud.common.core.ienum.IEnum; + +import java.lang.reflect.Type; + +/** + * Dict 枚举的 Fastjson 序列化器
+ * 使用方式（二选一即可）:
+ * 1、在字段上使用 JSONField 进行指定
+ * 如，@JSONField(serializeUsing = DictObjectSerializer.class)
+ * 2、在枚举类上使用 JSONType 进行指定（在接口上指定无效）
+ * 如，@JSONType(writeEnumAsJavaBean = true, serializer = DictObjectSerializer.class)

+ * JSON 格式
+ * 1、枚举不是其他对象的属性
+ * 
+ * {
+ *   "type": "", // 枚举全限定类名, 反序列化时会用到
+ *   "name": "", // name 属性
+ *   "ordinal": 0, // ordinal 属性
+ *   "val": 1,  // val 属性(字符串/数字), 反序列化时会用到
+ *   "txt": "1" // txt 属性
+ * }
+ * 2、枚举是其他对象的属性
+ * 
+ * {
+ *   // ... 其他属性
+ *   "原字段名称": 1, // val 属性(字符串/数字), 反序列化时会用到
+ *   "原字段名称Txt": "1" //  txt 属性
+ * }
+ * + * @see Dict + * @see DictInt + * @see DictStr + */ +public class DictObjectSerializer implements ObjectWriter { + + @Override + public void write(JSONWriter jsonWriter, Object object, Object fieldName, Type fieldType, long features) { + if (object == null) { + jsonWriter.writeNull(); + return; + } + + if (fieldType == null) { + Dict dict = (Dict) object; + jsonWriter.startObject(); + + jsonWriter.writeName(IEnum.ENUM_TYPE); + jsonWriter.writeColon(); + jsonWriter.writeString(dict.getClass().getName()); + + jsonWriter.writeName(IEnum.ENUM_NAME); + jsonWriter.writeColon(); + jsonWriter.writeString(((Enum) dict).name()); + + jsonWriter.writeName(IEnum.ENUM_ORDINAL); + jsonWriter.writeColon(); + jsonWriter.writeInt32(((Enum) dict).ordinal()); + + jsonWriter.writeName(Dict.ENUM_VAL); + jsonWriter.writeColon(); + jsonWriter.writeAny(dict.getVal()); + + jsonWriter.writeName(Dict.ENUM_TXT); + jsonWriter.writeColon(); + jsonWriter.writeString(dict.getTxt()); + + jsonWriter.endObject(); + } else { + Class clazz = TypeUtils.getClass(fieldType); + + if (DictInt.class.isAssignableFrom(clazz)) { + DictInt dictInt = (DictInt) object; + jsonWriter.writeInt32(dictInt.getVal()); + + jsonWriter.writeName(fieldName + "Txt"); + jsonWriter.writeColon(); + jsonWriter.writeString(dictInt.getTxt()); + } else if (DictStr.class.isAssignableFrom(clazz)) { + DictStr dictStr = (DictStr) object; + jsonWriter.writeString(dictStr.getVal()); + jsonWriter.writeName(fieldName + "Txt"); + jsonWriter.writeColon(); + jsonWriter.writeString(dictStr.getTxt()); + } else { + jsonWriter.writeNull(); + } + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java new file mode 100644 index 0000000..518ceed --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClient.java @@ -0,0 +1,208 @@ +package com.njzscloud.common.core.http; + +import cn.hutool.core.collection.CollUtil; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.support.ResponseInfo; +import com.njzscloud.common.core.tuple.Tuple2; +import lombok.extern.slf4j.Slf4j; +import okhttp3.*; + +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * HTTP 客户端 + * + * @see okhttp3.OkHttpClient + */ +@Slf4j +public final class HttpClient { + private static volatile HttpClient DEFAULT; + + private final OkHttpClient OK_HTTP_CLIENT; + + public HttpClient(HttpClientProperties httpClientProperties) { + this(httpClientProperties, null); + } + + public HttpClient(OkHttpClient okHttpClient) { + OK_HTTP_CLIENT = okHttpClient; + } + + public HttpClient(HttpClientProperties httpClientProperties, ExecutorService executorService) { + Duration callTimeout = httpClientProperties.getCallTimeout(); + Duration keepAliveTime = httpClientProperties.getKeepAliveTime(); + long keepAliveTimeSeconds = keepAliveTime.getSeconds(); + int maxIdleConnections = httpClientProperties.getMaxIdleConnections(); + Duration readTimeout = httpClientProperties.getReadTimeout(); + Duration connectTimeout = httpClientProperties.getConnectTimeout(); + + ConnectionPool connectionPool = new ConnectionPool(maxIdleConnections, keepAliveTimeSeconds, TimeUnit.SECONDS); + + OkHttpClient.Builder builder = new OkHttpClient.Builder() + .callTimeout(callTimeout) + .readTimeout(readTimeout) + .connectTimeout(connectTimeout) + .connectionPool(connectionPool); + if (executorService != null) { + Dispatcher dispatcher = new Dispatcher(executorService); + builder.dispatcher(dispatcher); + } + + this.OK_HTTP_CLIENT = builder.build(); + } + + private HttpClient() { + this(HttpClientProperties.DEFAULT); + } + + public static synchronized HttpClient defaultHttpClient() { + if (DEFAULT == null) DEFAULT = new HttpClient(); + return DEFAULT; + } + + /* private Request buildRequest(HttpServer httpServer, + HttpEndpoint httpEndpoint, + RequestParamBuilder requestParamBuilder, + RequestInterceptor requestInterceptor) { + + + if (requestInterceptor != null) { + RequestParam processed = requestInterceptor.process(httpServer, httpEndpoint, requestParamBuilder); + if (processed != null) requestParam = processed; + } + + HttpMethod httpMethod = httpEndpoint.httpMethod; + String url = httpEndpoint.urlTpl; + BodyParam bodyParam = requestParam.bodyParam; + + + Map pathParamMap = requestParam.pathParam.getParam(); + if (CollUtil.isNotEmpty(pathParamMap)) { + url = StrUtil.format(url, pathParamMap); + } + + Map queryParamMap = requestParam.queryParam.getParam(); + String query = Param.kvStr(queryParamMap); + if (StrUtil.isNotBlank(query)) { + query = "?" + query; + } + url = url + query; + + Headers headers = null; + Map headerParamMap = requestParam.headerParam.getParam(); + if (CollUtil.isNotEmpty(headerParamMap)) { + Headers.Builder headerBuilder = new Headers.Builder(); + Set> entries = headerParamMap.entrySet(); + for (Map.Entry entry : entries) { + String key = entry.getKey(); + Object value = entry.getValue(); + if (value != null) headerBuilder.set(key, value.toString()); + } + headers = headerBuilder.build(); + } + + + RequestBody postBody = null; + if (httpMethod != HttpMethod.GET) { + byte[] param = bodyParam.getParam(); + postBody = RequestBody.create(param, MediaType.parse(bodyParam.contentType)); + } + + Request.Builder requestBuilder = new Request.Builder() + .url(httpServer + url) + .method(httpMethod.name(), postBody); + + if (headers != null) { + requestBuilder.headers(headers); + } + + return requestBuilder.build(); + } + + public T execute( + HttpServer httpServer, + HttpEndpoint endpoint, + RequestParamBuilder requestParamBuilder, + Type responseType, + RequestInterceptor requestInterceptor, + ResponseInterceptor responseInterceptor + ) { + ResponseResult.ResponseResultBuilder responseResultBuilder = ResponseResult.builder(); + + Response response = null; + ResponseBody responseBody = null; + Integer code = null; + String message = null; + Headers headers = null; + byte[] body = new byte[0]; + + try { + Request request = buildRequest(httpServer, endpoint, requestParamBuilder, requestInterceptor); + Call call = this.OK_HTTP_CLIENT.newCall(request); + response = call.execute(); + responseBody = response.body(); + if (responseBody != null) { + body = responseBody.bytes(); + } + code = response.code(); + message = response.message(); + headers = response.headers(); + + responseResultBuilder. + code(code) + .status(message) + .headers(headers.toMultimap()) + .body(body) + .build(); + } catch (Exception e) { + log.error("", e); + responseResultBuilder.e(e); + } finally { + if (responseBody != null) responseBody.close(); + if (response != null) response.close(); + } + + return responseInterceptor.process( + responseType, + httpServer, endpoint, requestParam, + responseResultBuilder.build()); + } */ + + + public ResponseInfo execute(HttpMethod httpMethod, String url, Map headers, Tuple2 body) { + Request.Builder requestBuilder = new Request.Builder().url(url); + + if (httpMethod != HttpMethod.GET) { + requestBuilder.method(httpMethod.name(), + RequestBody.create(body.get_1(), + MediaType.parse(body.get_0()) + )); + } + + if (CollUtil.isNotEmpty(headers)) { + Headers.Builder headerBuilder = new Headers.Builder(); + headers.forEach(headerBuilder::set); + requestBuilder.headers(headerBuilder.build()); + } + + try ( + Response response = this.OK_HTTP_CLIENT + .newCall(requestBuilder.build()) + .execute(); + ResponseBody responseBody = response.body() + ) { + int code = response.code(); + String message = response.message(); + Map> responseHeaders = response.headers().toMultimap(); + byte[] bytes = responseBody == null ? new byte[0] : responseBody.bytes(); + return ResponseInfo.create(code, message, responseHeaders, bytes); + } catch (Exception e) { + log.error("", e); + return ResponseInfo.create(0, "http 请求失败", null, null); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientAutoConfiguration.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientAutoConfiguration.java new file mode 100644 index 0000000..1534dcd --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientAutoConfiguration.java @@ -0,0 +1,25 @@ +package com.njzscloud.common.core.http; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * + */ +@Configuration +@EnableConfigurationProperties(HttpClientProperties.class) +public class HttpClientAutoConfiguration { + + @Bean + @ConditionalOnMissingBean + public HttpClient httpClient(HttpClientProperties httpClientProperties) { + return new HttpClient(httpClientProperties); + } + + @Bean + public HttpClientDecorator httpClientDecorator(HttpClient httpClient) { + return new HttpClientDecorator(httpClient); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java new file mode 100644 index 0000000..b8fd926 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientDecorator.java @@ -0,0 +1,201 @@ +package com.njzscloud.common.core.http; + +import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.SimpleCache; +import cn.hutool.core.util.ReflectUtil; +import com.njzscloud.common.core.http.annotation.GetEndpoint; +import com.njzscloud.common.core.http.annotation.PostEndpoint; +import com.njzscloud.common.core.http.annotation.RemoteServer; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.interceptor.RequestInterceptor; +import com.njzscloud.common.core.http.interceptor.ResponseInterceptor; +import com.njzscloud.common.core.http.resolver.*; +import com.njzscloud.common.core.http.support.RequestInfo; +import com.njzscloud.common.core.http.support.ResponseInfo; +import com.njzscloud.common.core.http.support.ResponseResult; +import com.njzscloud.common.core.tuple.Tuple2; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Parameter; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 服务装饰器, 用于 "接口注解式" HTTP 请求配置, 使用 cglib 进行接口装饰 + *

注: 在使用异步请求时, 接口方法的返回值不能是 void, 除非 HTTP 请求确实没有返回值

+ */ +@SuppressWarnings("unchecked") +public class HttpClientDecorator { + private static final SimpleCache, Object> ENHANCER_CACHE = new SimpleCache<>(); + + private final HttpClient HTTP_CLIENT; + + public HttpClientDecorator(HttpClient httpClient) { + HTTP_CLIENT = httpClient; + } + + public T decorate(Class clazz) { + return (T) ENHANCER_CACHE.get(clazz, () -> { + MethodInterceptor methodInterceptor = new MethodInterceptorImpl(clazz, HTTP_CLIENT); + Enhancer enhancer = new Enhancer(); + enhancer.setInterfaces(new Class[]{clazz}); + enhancer.setCallback(methodInterceptor); + return enhancer.create(); + }); + } + + @SuppressWarnings("RedundantLengthCheck") + private static class MethodInterceptorImpl implements MethodInterceptor { + private static final Pattern ADDR_PATTERN = Pattern.compile("(?http(?:s)?):\\/\\/(?[0-9a-zA-Z_\\-\\.]+)(?::(?[0-9]+))?(?\\/\\S*)*"); + private final HttpClient HTTP_CLIENT; + private final String baseUrl; + private final RequestInterceptor requestInterceptor; + private final ResponseInterceptor responseInterceptor; + + public MethodInterceptorImpl(Class clazz, HttpClient httpClient) { + RemoteServer anno = clazz.getAnnotation(RemoteServer.class); + baseUrl = anno.value(); + Matcher matcher = ADDR_PATTERN.matcher(baseUrl); + Assert.isTrue(matcher.matches(), "地址不合法"); + Class requestedInterceptorClazz = anno.requestInterceptor(); + Class responseInterceptorClazz = anno.responseInterceptor(); + requestInterceptor = ReflectUtil.newInstance(requestedInterceptorClazz); + responseInterceptor = ReflectUtil.newInstance(responseInterceptorClazz); + + HTTP_CLIENT = httpClient; + } + + @Override + public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable { + HttpMethod httpMethod; + String urlTpl; + String desc; + + GetEndpoint getEndpoint = method.getAnnotation(GetEndpoint.class); + if (getEndpoint == null) { + PostEndpoint postEndpoint = method.getAnnotation(PostEndpoint.class); + if (postEndpoint == null) { + // + return null; + } else { + httpMethod = HttpMethod.POST; + urlTpl = baseUrl + postEndpoint.value(); + desc = postEndpoint.desc(); + } + } else { + httpMethod = HttpMethod.GET; + urlTpl = baseUrl + getEndpoint.value(); + desc = getEndpoint.desc(); + } + + Object[] additional = requestInterceptor.process(httpMethod, urlTpl, args); + + Parameter[] parameters = method.getParameters(); + + PathParamResolver pathParamResolver = new PathParamResolver(); + QueryParamResolver queryParamResolver = new QueryParamResolver(); + HeaderParamResolver headerParamResolver = new HeaderParamResolver(); + BodyParamResolver bodyParamResolver = null; + JsonBodyParamResolver jsonBodyParamResolver = null; + XmlBodyParamResolver xmlBodyParamResolver = null; + FormBodyParamResolver formBodyParamResolver = null; + MultiBodyParamResolver multiBodyParamResolver = null; + + List> paramResolvers = ListUtil.list(false, + pathParamResolver, + queryParamResolver, + headerParamResolver + ); + + if (httpMethod != HttpMethod.GET) { + jsonBodyParamResolver = new JsonBodyParamResolver(); + xmlBodyParamResolver = new XmlBodyParamResolver(); + formBodyParamResolver = new FormBodyParamResolver(); + multiBodyParamResolver = new MultiBodyParamResolver(); + bodyParamResolver = new BodyParamResolver(); + paramResolvers.add(jsonBodyParamResolver); + paramResolvers.add(xmlBodyParamResolver); + paramResolvers.add(formBodyParamResolver); + paramResolvers.add(multiBodyParamResolver); + paramResolvers.add(bodyParamResolver); + } + + if (additional != null) { + for (Object o : additional) { + for (ParamResolver resolver : paramResolvers) { + resolver.resolve(o); + } + } + } + + for (int i = 0; i < parameters.length; i++) { + Parameter parameter = parameters[i]; + for (ParamResolver resolver : paramResolvers) { + resolver.resolve(parameter, args[i]); + } + } + + urlTpl = pathParamResolver.resolve(httpMethod, urlTpl); + urlTpl = queryParamResolver.resolve(httpMethod, urlTpl); + Map headers = headerParamResolver.resolve(httpMethod, urlTpl); + Tuple2 body = null; + if (httpMethod != HttpMethod.GET) { + body = jsonBodyParamResolver.resolve(httpMethod, urlTpl); + if (body == null) body = xmlBodyParamResolver.resolve(httpMethod, urlTpl); + if (body == null) body = formBodyParamResolver.resolve(httpMethod, urlTpl); + if (body == null) body = multiBodyParamResolver.resolve(httpMethod, urlTpl); + if (body == null) body = bodyParamResolver.resolve(httpMethod, urlTpl); + if (body == null) body = Tuple2.create("", new byte[0]); + } + + ResponseInfo responseInfo = HTTP_CLIENT.execute(httpMethod, urlTpl, headers, body); + + RequestInfo requestInfo = RequestInfo.create(desc, httpMethod, urlTpl, headers, body); + + Type genericReturnType = method.getGenericReturnType(); + + Type returnType; + Type rawType; + + if (genericReturnType instanceof ParameterizedType) { + ParameterizedType typeWrap = (ParameterizedType) genericReturnType; + + rawType = typeWrap.getRawType(); + + if (rawType == ResponseResult.class) { + returnType = typeWrap.getActualTypeArguments()[0]; + } else { + returnType = typeWrap; + } + } else { + returnType = genericReturnType; + rawType = genericReturnType; + } + + Object res = responseInterceptor.process(requestInfo, responseInfo, returnType); + + if (ResponseResult.class == rawType) { + return ResponseResult + .builder() + .code(responseInfo.code) + .status(responseInfo.message) + .headers(responseInfo.header) + .body(res) + .e(responseInfo.e) + .build(); + } + + return res; + } + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java new file mode 100644 index 0000000..8c8924d --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/HttpClientProperties.java @@ -0,0 +1,62 @@ +package com.njzscloud.common.core.http; + +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.time.Duration; + +/** + * HTTP 客户端配置 + */ +@Getter +@Setter +@Accessors(chain = true) +@ConfigurationProperties("okhttp-client") +public class HttpClientProperties { + + public static final HttpClientProperties DEFAULT = new HttpClientProperties(); + + /** + * 调用的超时 + * 覆盖解析 DNS、连接、写入请求正文、服务器处理和读取响应正文等。如果调用需要重定向或重试，所有都必须在一个超时期限内完成。 + * 默认 0，0 表示不限制 + */ + private Duration callTimeout = Duration.ofSeconds(0); + + /** + * 读取超时 + * 默认 10s，0 表示不限制 + */ + private Duration readTimeout = Duration.ofSeconds(10); + + /** + * 连接超时 + * TCP 套接字连接到目标主机超时时间 + * 默认 10s，0 表示不限制 + */ + private Duration connectTimeout = Duration.ofSeconds(10); + + /** + * 最大活跃连接数, IP 和 port 相同的 HTTP 请求通常共享同一个连接 + * 默认 500 + */ + private int maxIdleConnections = 500; + + /** + * 连接空闲时间 + * 默认 10min + */ + private Duration keepAliveTime = Duration.ofMinutes(10); + + /** + * 是否禁用 SSL 验证, 默认 false 不禁用 + */ + private boolean disableSslValidation = false; + + /** + * 是否允许重定向, 默认 true 允许 + */ + private boolean followRedirects = true; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java new file mode 100644 index 0000000..85c93b8 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/BodyParam.java @@ -0,0 +1,23 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.BodyParamProcessor; +import com.njzscloud.common.core.http.processor.DefaultBodyParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface BodyParam { + String contentType() default ""; + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultBodyParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java new file mode 100644 index 0000000..da1a901 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/FormBodyParam.java @@ -0,0 +1,32 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.FormBodyParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.RoundingMode; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface FormBodyParam { + /** + * 字段名 + * + * @return String + */ + String value() default ""; + + String format() default ""; + + RoundingMode roundingMode() default RoundingMode.HALF_UP; + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default FormBodyParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java new file mode 100644 index 0000000..1772cd1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/GetEndpoint.java @@ -0,0 +1,28 @@ +package com.njzscloud.common.core.http.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; + +/** + * GET 请求端点注解 + */ +@Target({METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface GetEndpoint { + /** + * 端点地址 + * + * @return String + */ + String value() default ""; + + /** + * 端点描述 + * + * @return String + */ + String desc() default ""; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java new file mode 100644 index 0000000..41990f1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/HeaderParam.java @@ -0,0 +1,33 @@ +package com.njzscloud.common.core.http.annotation; + + +import com.njzscloud.common.core.http.processor.DefaultHeaderParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.RoundingMode; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface HeaderParam { + /** + * 字段名 + * + * @return String + */ + String value() default ""; + + String format() default ""; + + RoundingMode roundingMode() default RoundingMode.HALF_UP; + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultHeaderParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java new file mode 100644 index 0000000..de470f2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/JsonBodyParam.java @@ -0,0 +1,21 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.DefaultJsonBodyParamProcessor; +import com.njzscloud.common.core.http.processor.JsonBodyParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface JsonBodyParam { + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultJsonBodyParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java new file mode 100644 index 0000000..85b70b1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/MultiBodyParam.java @@ -0,0 +1,37 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.MultiBodyParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.RoundingMode; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface MultiBodyParam { + /** + * 字段名 + * + * @return String + */ + String value() default ""; + + String format() default ""; + + String filename() default ""; + + RoundingMode roundingMode() default RoundingMode.HALF_UP; + + String contentType() default ""; + + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default MultiBodyParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java new file mode 100644 index 0000000..47cfd04 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PathParam.java @@ -0,0 +1,34 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.DefaultPathParamProcessor; +import com.njzscloud.common.core.http.processor.PathParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.RoundingMode; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface PathParam { + /** + * 字段名 + * + * @return String + */ + String value() default ""; + + String format() default ""; + + RoundingMode roundingMode() default RoundingMode.HALF_UP; + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultPathParamProcessor.class; + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java new file mode 100644 index 0000000..394460f --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/PostEndpoint.java @@ -0,0 +1,28 @@ +package com.njzscloud.common.core.http.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; + +/** + * POST 请求端点注解 + */ +@Target({METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface PostEndpoint { + /** + * 端点地址 + * + * @return String + */ + String value() default ""; + + /** + * 端点描述 + * + * @return String + */ + String desc() default ""; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java new file mode 100644 index 0000000..43181f7 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/QueryParam.java @@ -0,0 +1,32 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.DefaultQueryParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.RoundingMode; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface QueryParam { + /** + * 字段名 + * + * @return String + */ + String value() default ""; + + String format() default ""; + + RoundingMode roundingMode() default RoundingMode.HALF_UP; + + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultQueryParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java new file mode 100644 index 0000000..965a90c --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/RemoteServer.java @@ -0,0 +1,44 @@ +package com.njzscloud.common.core.http.annotation; + + +import com.njzscloud.common.core.http.interceptor.CompositeInterceptor; +import com.njzscloud.common.core.http.interceptor.RequestInterceptor; +import com.njzscloud.common.core.http.interceptor.ResponseInterceptor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; + +/** + * HTTP 服务器配置 + */ +@Target({TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface RemoteServer { + /** + * 服务器地址, 如, http://localhost:80/api + * + * @return String + */ + String value(); + + /** + * 请求拦截器, 在请求之前触发 + * + * @return RequestInterceptor.class + * @see RequestInterceptor + * @see CompositeInterceptor + */ + Class requestInterceptor() default CompositeInterceptor.class; + + /** + * 响应拦截器, 在请求之后触发 + * + * @return ResponseInterceptor.class + * @see ResponseInterceptor + * @see CompositeInterceptor + */ + Class responseInterceptor() default CompositeInterceptor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java new file mode 100644 index 0000000..c0fb0e6 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/annotation/XmlBodyParam.java @@ -0,0 +1,21 @@ +package com.njzscloud.common.core.http.annotation; + +import com.njzscloud.common.core.http.processor.DefaultXmlBodyParamProcessor; +import com.njzscloud.common.core.http.processor.XmlBodyParamProcessor; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; + +@Target({TYPE, FIELD, PARAMETER, METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface XmlBodyParam { + /** + * 参数处理器 + * + * @return ParamProcessor + */ + Class processor() default DefaultXmlBodyParamProcessor.class; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java new file mode 100644 index 0000000..232d6dc --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/HttpMethod.java @@ -0,0 +1,8 @@ +package com.njzscloud.common.core.http.constant; + +/** + * HTTP 方法 + */ +public enum HttpMethod { + GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE, CONNECT, PATCH +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java new file mode 100644 index 0000000..fa1ae79 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/constant/Mime.java @@ -0,0 +1,39 @@ +package com.njzscloud.common.core.http.constant; + +import cn.hutool.core.util.StrUtil; + +/** + * MIME + */ +public interface Mime { + String FORM = "application/x-www-form-urlencoded"; + String MULTIPART_FORM = "multipart/form-data"; + String BINARY = "application/octet-stream"; + String JSON = "application/json"; + String X_NDJSON = "application/x-ndjson"; + String XML = "application/xml"; + String TXT = "text/plain"; + String HTML = "text/html"; + String CSS = "text/css"; + String GIF = "image/gif"; + String JPG = "image/jpeg"; + String PNG = "image/png"; + String SVG = "image/svg+xml"; + String WEBP = "image/webp"; + String PDF = "image/pdf"; + String PPTX = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; + String XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + String DOCX = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; + String PPT = "application/vnd.ms-powerpoint"; + String XLS = "application/vnd.ms-excel"; + String DOC = "application/msword"; + String ZIP = "application/zip"; + String MP3 = "audio/mpeg"; + String MP4 = "video/mp4"; + + + static String u8Val(String mime) { + return StrUtil.format("{};charset={}", mime, "UTF-8"); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java new file mode 100644 index 0000000..4963c6d --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/CompositeInterceptor.java @@ -0,0 +1,47 @@ +package com.njzscloud.common.core.http.interceptor; + +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.support.RequestInfo; +import com.njzscloud.common.core.http.support.ResponseInfo; +import com.njzscloud.common.core.jackson.Jackson; +import lombok.extern.slf4j.Slf4j; + +import java.lang.reflect.Type; + + +/** + * 组合式拦截器, 响应拦截器默认解析 JSON 类型参数 + * + * @see RequestInterceptor + * @see ResponseInterceptor + */ +@Slf4j +public class CompositeInterceptor implements RequestInterceptor, ResponseInterceptor { + + @Override + public Object[] process(HttpMethod method, String url, Object[] args) { + return null; + } + + @Override + public Object process(RequestInfo requestInfo, ResponseInfo responseInfo, Type responseType) { + System.out.println(Jackson.toJsonStr(requestInfo)); + System.out.println(new String(requestInfo.body)); + + Object data = new String(responseInfo.body); + + /* if (responseInfo.success) { + if (responseInfo.body != null) { + data = Jackson.toBean(responseInfo.body, responseType); + log.info("Jackson: {}", JSON.toJSONString(data)); + data = JSON.parseObject(responseInfo.body, responseType); + log.info("Fastjson: {}", JSON.toJSONString(data)); + } + } else { + log.error("HTTP请求失败"); + } */ + + + return data; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java new file mode 100644 index 0000000..f718c3a --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/RequestInterceptor.java @@ -0,0 +1,11 @@ +package com.njzscloud.common.core.http.interceptor; + + +import com.njzscloud.common.core.http.constant.HttpMethod; + +/** + * 请求拦截器, 在请求之前触发, 可修改请求参数 + */ +public interface RequestInterceptor { + Object[] process(HttpMethod method, String url, Object[] args); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java new file mode 100644 index 0000000..7048514 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/interceptor/ResponseInterceptor.java @@ -0,0 +1,17 @@ +package com.njzscloud.common.core.http.interceptor; + + +import com.njzscloud.common.core.http.support.RequestInfo; +import com.njzscloud.common.core.http.support.ResponseInfo; + +import java.lang.reflect.Type; + +/** + * 响应拦截器, 在请求之后触发, + * 无论请求是否成功或是发生异常都会调用, + * 可用于响应结果解析 + */ +public interface ResponseInterceptor { + + Object process(RequestInfo requestInfo, ResponseInfo responseInfo, Type responseType); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java new file mode 100644 index 0000000..9d71fb6 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/BodyParamProcessor.java @@ -0,0 +1,7 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.BodyParam; + +public interface BodyParamProcessor { + byte[] process(BodyParam bodyParam, String paramName, Class paramClazz, Object paramValue); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java new file mode 100644 index 0000000..700ea83 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultBodyParamProcessor.java @@ -0,0 +1,19 @@ +package com.njzscloud.common.core.http.processor; + +import cn.hutool.core.util.ReflectUtil; +import com.njzscloud.common.core.http.annotation.BodyParam; + +import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; + +public class DefaultBodyParamProcessor implements BodyParamProcessor { + @Override + public byte[] process(BodyParam bodyParam, String paramName, Class paramClazz, Object paramValue) { + Method toBytesMethod = ReflectUtil.getMethod(paramClazz, "toBytes"); + if (toBytesMethod == null) { + return paramValue.toString().getBytes(StandardCharsets.UTF_8); + } else { + return ReflectUtil.invoke(paramValue, toBytesMethod); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java new file mode 100644 index 0000000..07b3aeb --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultFormBodyParamProcessor.java @@ -0,0 +1,13 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.FormBodyParam; + +import java.util.List; +import java.util.Map; + +public class DefaultFormBodyParamProcessor implements FormBodyParamProcessor { + @Override + public void process(FormBodyParam formBodyParam, String paramName, Class paramClazz, Object paramValue, Map> result) { + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java new file mode 100644 index 0000000..b9bd685 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultHeaderParamProcessor.java @@ -0,0 +1,13 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.HeaderParam; + +import java.util.List; +import java.util.Map; + +public class DefaultHeaderParamProcessor implements HeaderParamProcessor { + @Override + public void process(HeaderParam headerParam, String paramName, Class paramClazz, Object paramValue, Map> result) { + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java new file mode 100644 index 0000000..9a2cedd --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultJsonBodyParamProcessor.java @@ -0,0 +1,11 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.JsonBodyParam; +import com.njzscloud.common.core.jackson.Jackson; + +public class DefaultJsonBodyParamProcessor implements JsonBodyParamProcessor { + @Override + public byte[] process(JsonBodyParam jsonBodyParam, String paramName, Class paramClazz, Object paramValue) { + return Jackson.toJsonBytes(paramValue); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java new file mode 100644 index 0000000..43028b9 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultMultiBodyParamProcessor.java @@ -0,0 +1,13 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.MultiBodyParam; +import com.njzscloud.common.core.tuple.Tuple3; + +import java.util.Map; + +public class DefaultMultiBodyParamProcessor implements MultiBodyParamProcessor { + @Override + public void process(MultiBodyParam multiBodyParam, String paramName, Class paramClazz, Object paramValue, Map> result) { + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java new file mode 100644 index 0000000..cc470c4 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultPathParamProcessor.java @@ -0,0 +1,13 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.PathParam; + +import java.util.Map; + +public class DefaultPathParamProcessor implements PathParamProcessor { + + @Override + public void process(PathParam pathParam, String paramName, Class paramClazz, Object paramValue, Map result) { + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java new file mode 100644 index 0000000..0e4c979 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultQueryParamProcessor.java @@ -0,0 +1,13 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.QueryParam; + +import java.util.List; +import java.util.Map; + +public class DefaultQueryParamProcessor implements QueryParamProcessor { + @Override + public void process(QueryParam queryParam, String paramName, Class paramClazz, Object paramValue, Map> result) { + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java new file mode 100644 index 0000000..3b996fc --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/DefaultXmlBodyParamProcessor.java @@ -0,0 +1,11 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.XmlBodyParam; +import com.njzscloud.common.core.jackson.Jackson; + +public class DefaultXmlBodyParamProcessor implements XmlBodyParamProcessor { + @Override + public byte[] process(XmlBodyParam xmlBodyParam, String paramName, Class paramClazz, Object paramValue) { + return Jackson.toXmlBytes(paramValue); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java new file mode 100644 index 0000000..9fcacb0 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/FormBodyParamProcessor.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.FormBodyParam; + +import java.util.List; +import java.util.Map; + +public interface FormBodyParamProcessor { + void process(FormBodyParam formBodyParam, String paramName, Class paramClazz, Object paramValue, Map> result); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java new file mode 100644 index 0000000..eb5576e --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/HeaderParamProcessor.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.HeaderParam; + +import java.util.List; +import java.util.Map; + +public interface HeaderParamProcessor { + void process(HeaderParam headerParam, String paramName, Class paramClazz, Object paramValue, Map> result); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java new file mode 100644 index 0000000..3fceb40 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/JsonBodyParamProcessor.java @@ -0,0 +1,7 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.JsonBodyParam; + +public interface JsonBodyParamProcessor { + byte[] process(JsonBodyParam jsonBodyParam, String paramName, Class paramClazz, Object paramValue); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java new file mode 100644 index 0000000..ee3801b --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/MultiBodyParamProcessor.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.MultiBodyParam; +import com.njzscloud.common.core.tuple.Tuple3; + +import java.util.Map; + +public interface MultiBodyParamProcessor { + void process(MultiBodyParam multiBodyParam, String paramName, Class paramClazz, Object paramValue, Map> result); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java new file mode 100644 index 0000000..7d05d5b --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/PathParamProcessor.java @@ -0,0 +1,9 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.PathParam; + +import java.util.Map; + +public interface PathParamProcessor { + void process(PathParam pathParam, String paramName, Class paramClazz, Object paramValue, Map result); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java new file mode 100644 index 0000000..bad3a65 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/QueryParamProcessor.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.QueryParam; + +import java.util.List; +import java.util.Map; + +public interface QueryParamProcessor { + void process(QueryParam queryParam, String paramName, Class paramClazz, Object paramValue, Map> result); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java new file mode 100644 index 0000000..d7ab83a --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/processor/XmlBodyParamProcessor.java @@ -0,0 +1,7 @@ +package com.njzscloud.common.core.http.processor; + +import com.njzscloud.common.core.http.annotation.XmlBodyParam; + +public interface XmlBodyParamProcessor { + byte[] process(XmlBodyParam xmlBodyParam, String paramName, Class paramClazz, Object paramValue); +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java new file mode 100644 index 0000000..f0745d1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/BodyParamResolver.java @@ -0,0 +1,43 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import com.njzscloud.common.core.http.annotation.BodyParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.http.processor.BodyParamProcessor; +import com.njzscloud.common.core.tuple.Tuple2; + +public class BodyParamResolver extends ParamResolver> { + byte[] result = null; + String contentType; + + public BodyParamResolver() { + super(BodyParam.class); + } + + @Override + public Tuple2 resolve(HttpMethod httpMethod, String urlTpl) { + if (result == null) return null; + return Tuple2.create(contentType == null ? Mime.BINARY : contentType, result); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(BodyParam anno, String paramName, Class paramClazz, Object paramValue) { + contentType = anno.contentType(); + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, BodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (hasParameterAnno) return false; + + contentType = anno.contentType(); + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + return true; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java new file mode 100644 index 0000000..0a69414 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/FormBodyParamResolver.java @@ -0,0 +1,97 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.http.annotation.FormBodyParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.http.processor.FormBodyParamProcessor; +import com.njzscloud.common.core.tuple.Tuple2; + +import java.math.RoundingMode; +import java.nio.charset.StandardCharsets; +import java.util.*; + +public class FormBodyParamResolver extends ParamResolver> { + Map> result = new HashMap<>(); + + public FormBodyParamResolver() { + super(FormBodyParam.class); + } + + @Override + public Tuple2 resolve(HttpMethod httpMethod, String urlTpl) { + if (result.isEmpty()) return null; + StringJoiner joiner = new StringJoiner("&"); + result.forEach((k, v) -> v.forEach(it -> joiner.add(k + "=" + it))); + byte[] bytes = joiner.toString().getBytes(StandardCharsets.UTF_8); + return Tuple2.create(Mime.FORM, bytes); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(FormBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + String value = anno.value(); + if (isKv(paramClazz)) resolveKv(paramValue); + else if (isArr(paramClazz)) resolveArr(StrUtil.isBlank(value) ? paramName : value, paramValue); + else if (isStr(paramClazz) || isNum(paramClazz) || isDt(paramClazz)) resolveFormable(anno, paramName, paramClazz, paramValue); + else return false; + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, FormBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (anno != null) { + Class processorClazz = anno.processor(); + if (processorClazz != FormBodyParamProcessor.class) { + ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue, result); + } else if (!hasParameterAnno && isKv(paramClazz)) { + resolveKv(paramValue); + } + } + if (anno != null) { + String value = anno.value(); + if (StrUtil.isNotBlank(value)) paramName = value; + } + if (isArr(paramClazz)) resolveArr(paramName, paramValue); + else resolveFormable(anno, paramName, paramClazz, paramValue); + return true; + } + + + protected void resolveKv(Object paramValue) { + ((Map) paramValue).forEach((k, v) -> { + if (v == null) return; + Class clazz = v.getClass(); + String paramName = k.toString(); + if (isArr(clazz)) resolveArr(paramName, v); + else resolveFormable(null, paramName, clazz, v); + }); + } + + + protected void resolveFormable(FormBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + String key = paramName; + String val; + + String format = null; + RoundingMode roundingMode = null; + if (anno != null) { + format = anno.format(); + roundingMode = anno.roundingMode(); + String value = anno.value(); + if (StrUtil.isNotBlank(value)) key = value; + } + + if (isNum(paramClazz)) { + val = formatNum(format, roundingMode, paramValue); + } else if (isDt(paramClazz)) { + val = formatDt(format, paramValue); + } else { + val = paramValue.toString(); + } + result.computeIfAbsent(key, it -> new ArrayList<>()).add(val); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java new file mode 100644 index 0000000..7b0ce38 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/HeaderParamResolver.java @@ -0,0 +1,92 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.http.annotation.HeaderParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.processor.DefaultHeaderParamProcessor; + +import java.math.RoundingMode; +import java.util.*; + +public class HeaderParamResolver extends ParamResolver> { + Map> result = new TreeMap<>(); + + public HeaderParamResolver() { + super(HeaderParam.class); + } + + @Override + public Map resolve(HttpMethod httpMethod, String urlTpl) { + HashMap map = new HashMap<>(); + result.forEach((k, v) -> map.put(k, String.join(",", v))); + return map; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(HeaderParam anno, String paramName, Class paramClazz, Object paramValue) { + String value = anno.value(); + if (isKv(paramClazz)) resolveKv(paramValue); + else if (isArr(paramClazz)) resolveArr(StrUtil.isBlank(value) ? paramName : value, paramValue); + else if (isStr(paramClazz) || isNum(paramClazz) || isDt(paramClazz)) resolveFormable(anno, paramName, paramClazz, paramValue); + else return false; + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, HeaderParam anno, String paramName, Class paramClazz, Object paramValue) { + if (anno != null) { + Class processorClazz = anno.processor(); + if (processorClazz != DefaultHeaderParamProcessor.class) { + ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue, result); + } else if (!hasParameterAnno && isKv(paramClazz)) { + resolveKv(paramValue); + } + } + if (anno != null) { + String value = anno.value(); + if (StrUtil.isNotBlank(value)) paramName = value; + } + if (isArr(paramClazz)) resolveArr(paramName, paramValue); + else resolveFormable(anno, paramName, paramClazz, paramValue); + return true; + } + + + protected void resolveKv(Object paramValue) { + ((Map) paramValue).forEach((k, v) -> { + if (v == null) return; + Class clazz = v.getClass(); + String paramName = k.toString(); + if (isArr(clazz)) resolveArr(paramName, v); + else resolveFormable(null, paramName, clazz, v); + }); + } + + + protected void resolveFormable(HeaderParam anno, String paramName, Class paramClazz, Object paramValue) { + String key = paramName; + String val; + + String format = null; + RoundingMode roundingMode = null; + if (anno != null) { + format = anno.format(); + roundingMode = anno.roundingMode(); + String value = anno.value(); + if (StrUtil.isNotBlank(value)) key = value; + } + + if (isNum(paramClazz)) { + val = formatNum(format, roundingMode, paramValue); + } else if (isDt(paramClazz)) { + val = formatDt(format, paramValue); + } else { + val = paramValue.toString(); + } + result.computeIfAbsent(key, it -> new ArrayList<>()).add(val); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java new file mode 100644 index 0000000..d6a3c6c --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/JsonBodyParamResolver.java @@ -0,0 +1,41 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import com.njzscloud.common.core.http.annotation.JsonBodyParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.http.processor.JsonBodyParamProcessor; +import com.njzscloud.common.core.tuple.Tuple2; + +public class JsonBodyParamResolver extends ParamResolver> { + byte[] result = null; + + public JsonBodyParamResolver() { + super(JsonBodyParam.class); + } + + @Override + public Tuple2 resolve(HttpMethod httpMethod, String urlTpl) { + if (result == null) return null; + return Tuple2.create(Mime.JSON, result); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(JsonBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, JsonBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (hasParameterAnno) return false; + + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + + return true; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java new file mode 100644 index 0000000..f29f737 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/MultiBodyParamResolver.java @@ -0,0 +1,141 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.URLUtil; +import com.njzscloud.common.core.http.annotation.MultiBodyParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.http.processor.MultiBodyParamProcessor; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.tuple.Tuple3; + +import java.io.ByteArrayOutputStream; +import java.math.RoundingMode; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; + +public class MultiBodyParamResolver extends ParamResolver> { + private static final byte[] DASHDASH = "--".getBytes(StandardCharsets.UTF_8); + private static final byte[] CRLF = StrUtil.CRLF.getBytes(StandardCharsets.UTF_8); + Map> result = new HashMap<>(); + + public MultiBodyParamResolver() { + super(MultiBodyParam.class); + } + + @Override + public Tuple2 resolve(HttpMethod httpMethod, String urlTpl) { + if (result.isEmpty()) return null; + + String boundary = RandomUtil.randomString(16); + String contentType = Mime.MULTIPART_FORM + "; boundary=" + boundary; + byte[] bytes = buildContent(boundary.getBytes(StandardCharsets.UTF_8)); + return Tuple2.create(contentType, bytes); + } + + private byte[] buildContent(byte[] boundary) { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + + result.forEach((k, v) -> { + String filename = URLUtil.encode(v.get_0()); + String contentType = v.get_1(); + byte[] bytes = v.get_2(); + + IoUtil.write(byteArrayOutputStream, false, DASHDASH); + IoUtil.write(byteArrayOutputStream, false, boundary); + IoUtil.write(byteArrayOutputStream, false, CRLF); + + byte[] contentDisposition; + if (StrUtil.isNotBlank(filename)) { + contentDisposition = StrUtil.format("Content-Disposition: form-data; name=\"{}\"; filename=\"{}\"", k, filename).getBytes(StandardCharsets.UTF_8); + } else { + contentDisposition = StrUtil.format("Content-Disposition: form-data; name=\"{}\"", k).getBytes(StandardCharsets.UTF_8); + } + + IoUtil.write(byteArrayOutputStream, false, contentDisposition); + IoUtil.write(byteArrayOutputStream, false, CRLF); + + if (StrUtil.isNotBlank(contentType)) { + IoUtil.write(byteArrayOutputStream, false, ("Content-Type: " + contentType).getBytes(StandardCharsets.UTF_8)); + IoUtil.write(byteArrayOutputStream, false, CRLF); + } + + IoUtil.write(byteArrayOutputStream, false, CRLF); + IoUtil.write(byteArrayOutputStream, false, bytes); + IoUtil.write(byteArrayOutputStream, false, CRLF); + + }); + IoUtil.write(byteArrayOutputStream, false, DASHDASH); + IoUtil.write(byteArrayOutputStream, false, boundary); + IoUtil.write(byteArrayOutputStream, false, DASHDASH); + + return byteArrayOutputStream.toByteArray(); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(MultiBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (isKv(paramClazz)) resolveKv(paramValue); + else if (isStr(paramClazz) || isNum(paramClazz) || isDt(paramClazz) || isBytes(paramClazz) || isIn(paramClazz) || isFile(paramClazz)) resolveFormable(anno, paramName, paramClazz, paramValue); + else return false; + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, MultiBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (anno != null) { + Class processorClazz = anno.processor(); + if (processorClazz != MultiBodyParamProcessor.class) { + ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue, result); + } else if (!hasParameterAnno && isKv(paramClazz)) { + resolveKv(paramValue); + } + } + resolveFormable(anno, paramName, paramClazz, paramValue); + return true; + } + + protected void resolveFormable(MultiBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + String key = paramName; + byte[] val; + String mime; + String filename = null; + + String format = null; + RoundingMode roundingMode = null; + if (anno != null) { + format = anno.format(); + roundingMode = anno.roundingMode(); + String value = anno.value(); + if (StrUtil.isNotBlank(value)) key = value; + } + + if (isNum(paramClazz)) { + mime = Mime.TXT; + val = formatNum(format, roundingMode, paramValue).getBytes(StandardCharsets.UTF_8); + } else if (isDt(paramClazz)) { + mime = Mime.TXT; + val = formatDt(format, paramValue).getBytes(StandardCharsets.UTF_8); + } else if (isBytes(paramClazz)) { + mime = Mime.BINARY; + val = (byte[]) paramValue; + } else if (isIn(paramClazz) || isFile(paramClazz)) { + mime = Mime.BINARY; + Tuple2 fileInfo = toFileInfo(paramValue); + filename = fileInfo.get_0(); + val = fileInfo.get_1(); + } else { + mime = Mime.TXT; + val = paramValue.toString().getBytes(StandardCharsets.UTF_8); + } + + result.put(key, Tuple3.create(filename, mime, val)); + + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java new file mode 100644 index 0000000..b9f6ddb --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/ParamResolver.java @@ -0,0 +1,242 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.tuple.Tuple3; +import lombok.RequiredArgsConstructor; + +import java.io.File; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Parameter; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAccessor; +import java.util.*; + +@RequiredArgsConstructor +public abstract class ParamResolver { + protected final Class annoType; + + abstract public R resolve(HttpMethod httpMethod, String urlTpl); + + public final void resolve(Parameter parameter, Object obj) { + if (obj == null) return; + + Class parameterClazz = obj.getClass(); + String parameterName; + T parameterAnno = null; + if (parameter == null) { + parameterName = StrUtil.lowerFirst(obj.getClass().getName()); + } else { + parameterName = parameter.getName(); + parameterAnno = parameter.getAnnotation(this.annoType); + } + + if (parameterAnno == null) { + parameterAnno = parameterClazz.getAnnotation(this.annoType); + } + + int state = 0; + + if (parameterAnno != null) { + state = this.resolveParameter(parameterAnno, parameterName, parameterClazz, obj) ? + 1 : + 2; + } + + if (state == 1) return; + + List getterMethods = ReflectUtil.getPublicMethods(parameterClazz, + it -> (it.getName().startsWith("get") || it.getName().startsWith("is")) && + !Modifier.isStatic(it.getModifiers()) && + !it.getName().equals("getClass") + ); + + for (Method getterMethod : getterMethods) { + Object fieldValue = ReflectUtil.invoke(obj, getterMethod); + if (fieldValue == null) continue; + String getterMethodName = getterMethod.getName(); + Class returnType = getterMethod.getReturnType(); + String fieldName = StrUtil.lowerFirst(getterMethodName.startsWith("get") ? + getterMethodName.substring(3) : + getterMethodName.substring(2)); + + T fieldAnno = getterMethod.getAnnotation(this.annoType); + if (fieldAnno == null) { + Field field = ReflectUtil.getField(parameterClazz, fieldName); + fieldAnno = field.getAnnotation(this.annoType); + } + + if (fieldAnno == null && state == 0) continue; + + this.resolveField(state == 2, fieldAnno, fieldName, returnType, fieldValue); + } + } + + public final void resolve(Object obj) { + resolve(null, obj); + } + + protected abstract boolean resolveParameter(T anno, String paramName, Class paramClazz, Object paramValue); + + protected abstract boolean resolveField(boolean hasParameterAnno, T anno, String paramName, Class paramClazz, Object paramValue); + + + public final boolean isNum(Class clazz) { + return clazz == byte.class || clazz == short.class || + clazz == int.class || clazz == long.class || + clazz == float.class || clazz == double.class + || Number.class.isAssignableFrom(clazz); + } + + protected final boolean isStr(Class clazz) { + return clazz == String.class || clazz == char.class || clazz == Character.class; + } + + protected final boolean isDt(Class clazz) { + return clazz == LocalDate.class || + clazz == LocalTime.class || + clazz == LocalDateTime.class || + Date.class.isAssignableFrom(clazz); + } + + protected final boolean isArr(Class clazz) { + return Collection.class.isAssignableFrom(clazz) || clazz.isArray(); + } + + protected final Collection toArr(Object obj) { + if (obj == null) return null; + Class clazz = obj.getClass(); + if (clazz.isArray()) { + return Arrays.asList((Object[]) obj); + } else if (Collection.class.isAssignableFrom(clazz)) { + return (Collection) obj; + } else { + throw new RuntimeException("不是数组"); + } + } + + protected final boolean isKv(Class clazz) { + return Map.class.isAssignableFrom(clazz); + } + + protected final boolean isIn(Class clazz) { + return InputStream.class.isAssignableFrom(clazz); + } + + protected final boolean isBytes(Class clazz) { + return clazz == byte[].class || clazz == Byte[].class; + } + + protected final Tuple2 toFileInfo(Object obj) { + if (obj == null) return null; + Class clazz = obj.getClass(); + if (isIn(clazz)) { + byte[] bytes = IoUtil.readBytes((InputStream) obj); + return Tuple3.create(null, bytes); + } else if (isFile(clazz)) { + byte[] bytes = FileUtil.readBytes((File) obj); + String name = ((File) obj).getName(); + return Tuple3.create(name, bytes); + } else { + throw new RuntimeException("不是文件"); + } + } + + protected final boolean isFile(Class clazz) { + return File.class.isAssignableFrom(clazz); + } + + + protected final String formatDt(String format, Object value) { + if (value == null) return null; + Class clazz = value.getClass(); + if (Date.class.isAssignableFrom(clazz)) { + if (StrUtil.isBlank(format)) format = DatePattern.NORM_DATETIME_PATTERN; + return DateUtil.format(((Date) value), format); + } else if (LocalDateTime.class.isAssignableFrom(clazz)) { + if (StrUtil.isBlank(format)) format = DatePattern.NORM_DATETIME_PATTERN; + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format); + return dateTimeFormatter.format((TemporalAccessor) value); + } else if (LocalDate.class.isAssignableFrom(clazz)) { + if (StrUtil.isBlank(format)) format = DatePattern.NORM_DATE_PATTERN; + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format); + return dateTimeFormatter.format((TemporalAccessor) value); + } else if (LocalTime.class.isAssignableFrom(clazz)) { + if (StrUtil.isBlank(format)) format = DatePattern.NORM_TIME_PATTERN; + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format); + return dateTimeFormatter.format((TemporalAccessor) value); + } else { + throw new RuntimeException("不是时间"); + } + } + + protected final String formatDt(Object value) { + return formatDt(null, value); + } + + protected final String formatNum(String format, RoundingMode roundingMode, Object value) { + if (value == null) return null; + if (StrUtil.isBlank(format)) return formatNum(value); + + Class clazz = value.getClass(); + if (isNum(clazz)) { + return NumberUtil.decimalFormat(format, value, roundingMode); + } else { + throw new RuntimeException("不是数字"); + } + } + + protected final String formatNum(String format, Object value) { + return formatNum(format, null, value); + } + + protected final String formatNum(Object value) { + if (value == null) return null; + + Class clazz = value.getClass(); + if (isNum(clazz)) { + if (clazz == BigDecimal.class) { + return ((BigDecimal) value).toPlainString(); + } else { + return value.toString(); + } + } else { + throw new RuntimeException("不是数字"); + } + } + + + protected void resolveKv(Object paramValue) { + ((Map) paramValue).forEach((k, v) -> { + if (v == null) return; + resolveFormable(null, k.toString(), v.getClass(), v); + }); + } + + protected void resolveArr(String paramName, Object paramValue) { + toArr(paramValue) + .stream() + .filter(Objects::nonNull) + .forEach(it -> resolveFormable(null, paramName, it.getClass(), it)); + } + + protected void resolveFormable(T anno, String paramName, Class paramClazz, Object paramValue) { + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java new file mode 100644 index 0000000..064b1d1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/PathParamResolver.java @@ -0,0 +1,74 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.http.annotation.PathParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.processor.PathParamProcessor; + +import java.math.RoundingMode; +import java.util.Map; +import java.util.TreeMap; + +public class PathParamResolver extends ParamResolver { + Map result = new TreeMap<>(); + + public PathParamResolver() { + super(PathParam.class); + } + + @Override + public String resolve(HttpMethod httpMethod, String urlTpl) { + if (result.isEmpty()) return urlTpl; + return StrUtil.format(urlTpl, result); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(PathParam anno, String paramName, Class paramClazz, Object paramValue) { + if (isKv(paramClazz)) resolveKv(paramValue); + else if (isStr(paramClazz) || isNum(paramClazz) || isDt(paramClazz)) resolveFormable(anno, paramName, paramClazz, paramValue); + else return false; + return true; + } + + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, PathParam anno, String paramName, Class paramClazz, Object paramValue) { + if (anno != null) { + Class processorClazz = anno.processor(); + if (processorClazz != PathParamProcessor.class) { + ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue, result); + } else if (!hasParameterAnno && isKv(paramClazz)) { + resolveKv(paramValue); + } + } + resolveFormable(anno, paramName, paramClazz, paramValue); + return true; + } + + protected void resolveFormable(PathParam anno, String paramName, Class paramClazz, Object paramValue) { + String key = paramName; + String val; + + String format = null; + RoundingMode roundingMode = null; + if (anno != null) { + format = anno.format(); + roundingMode = anno.roundingMode(); + String value = anno.value(); + if (StrUtil.isNotBlank(value)) key = value; + } + + if (isNum(paramClazz)) { + val = formatNum(format, roundingMode, paramValue); + } else if (isDt(paramClazz)) { + val = formatDt(format, paramValue); + } else { + val = paramValue.toString(); + } + result.put(key, val); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java new file mode 100644 index 0000000..15abff5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/QueryParamResolver.java @@ -0,0 +1,92 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.http.annotation.QueryParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.processor.DefaultQueryParamProcessor; + +import java.math.RoundingMode; +import java.util.*; + +public class QueryParamResolver extends ParamResolver { + Map> result = new TreeMap<>(); + + public QueryParamResolver() { + super(QueryParam.class); + } + + @Override + public String resolve(HttpMethod httpMethod, String urlTpl) { + if (result.isEmpty()) return urlTpl; + StringJoiner joiner = new StringJoiner("&", urlTpl + (urlTpl.contains("?") ? "&" : "?"), ""); + result.forEach((k, v) -> v.forEach(it -> joiner.add(k + "=" + it))); + return joiner.toString(); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(QueryParam anno, String paramName, Class paramClazz, Object paramValue) { + String value = anno.value(); + if (isKv(paramClazz)) resolveKv(paramValue); + else if (isArr(paramClazz)) resolveArr(StrUtil.isBlank(value) ? paramName : value, paramValue); + else if (isStr(paramClazz) || isNum(paramClazz) || isDt(paramClazz)) resolveFormable(anno, paramName, paramClazz, paramValue); + else return false; + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, QueryParam anno, String paramName, Class paramClazz, Object paramValue) { + if (anno != null) { + Class processorClazz = anno.processor(); + if (processorClazz != DefaultQueryParamProcessor.class) { + ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue, result); + } else if (!hasParameterAnno && isKv(paramClazz)) { + resolveKv(paramValue); + } + } + if (anno != null) { + String value = anno.value(); + if (StrUtil.isNotBlank(value)) paramName = value; + } + if (isArr(paramClazz)) resolveArr(paramName, paramValue); + else resolveFormable(anno, paramName, paramClazz, paramValue); + return true; + } + + protected void resolveKv(Object paramValue) { + ((Map) paramValue).forEach((k, v) -> { + if (v == null) return; + Class clazz = v.getClass(); + String paramName = k.toString(); + if (isArr(clazz)) resolveArr(paramName, v); + else resolveFormable(null, paramName, clazz, v); + }); + } + + + protected void resolveFormable(QueryParam anno, String paramName, Class paramClazz, Object paramValue) { + String key = paramName; + String val; + + String format = null; + RoundingMode roundingMode = null; + if (anno != null) { + format = anno.format(); + roundingMode = anno.roundingMode(); + String value = anno.value(); + if (StrUtil.isNotBlank(value)) key = value; + } + + if (isNum(paramClazz)) { + val = formatNum(format, roundingMode, paramValue); + } else if (isDt(paramClazz)) { + val = formatDt(format, paramValue); + } else { + val = paramValue.toString(); + } + result.computeIfAbsent(key, it -> new ArrayList<>()).add(val); + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java new file mode 100644 index 0000000..64670d1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/resolver/XmlBodyParamResolver.java @@ -0,0 +1,41 @@ +package com.njzscloud.common.core.http.resolver; + +import cn.hutool.core.util.ReflectUtil; +import com.njzscloud.common.core.http.annotation.XmlBodyParam; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.http.processor.XmlBodyParamProcessor; +import com.njzscloud.common.core.tuple.Tuple2; + +public class XmlBodyParamResolver extends ParamResolver> { + byte[] result = null; + + public XmlBodyParamResolver() { + super(XmlBodyParam.class); + } + + @Override + public Tuple2 resolve(HttpMethod httpMethod, String urlTpl) { + if (result == null) return null; + + return Tuple2.create(Mime.XML, result); + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveParameter(XmlBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + return true; + } + + @Override + @SuppressWarnings("unchecked") + protected boolean resolveField(boolean hasParameterAnno, XmlBodyParam anno, String paramName, Class paramClazz, Object paramValue) { + if (hasParameterAnno) return false; + + Class processorClazz = anno.processor(); + result = ReflectUtil.newInstance(processorClazz).process(anno, paramName, paramClazz, paramValue); + return true; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java new file mode 100644 index 0000000..fcd7aae --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ParameterInfo.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.http.support; + +import java.lang.annotation.Annotation; +import java.util.List; + +public class ParameterInfo { + private String name; + private List annoList; + private Object value; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java new file mode 100644 index 0000000..23009fc --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/RequestInfo.java @@ -0,0 +1,29 @@ +package com.njzscloud.common.core.http.support; + +import cn.hutool.core.map.MapUtil; +import com.njzscloud.common.core.http.constant.HttpMethod; +import com.njzscloud.common.core.tuple.Tuple2; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +public class RequestInfo { + public final String desc; + public final HttpMethod method; + public final String url; + public final Map headers; + public final String contentType; + public final byte[] body; + + public static RequestInfo create(String desc, HttpMethod method, String url, Map headers, Tuple2 body) { + String contentType = null; + byte[] bytes = null; + if (body != null) { + contentType = body.get_0(); + bytes = body.get_1(); + } + return new RequestInfo(desc, method, url, MapUtil.unmodifiable(headers), contentType, bytes); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java new file mode 100644 index 0000000..0719f98 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseInfo.java @@ -0,0 +1,32 @@ +package com.njzscloud.common.core.http.support; + +import cn.hutool.core.map.MapUtil; + +import java.util.List; +import java.util.Map; + +public class ResponseInfo { + public final boolean success; + public final int code; + public final String message; + public final Map> header; + public final byte[] body; + public final Exception e; + + public ResponseInfo(boolean success, int code, String message, Map> header, byte[] body, Exception e) { + this.success = success; + this.code = code; + this.message = message; + this.header = header; + this.body = body; + this.e = e; + } + + public static ResponseInfo create(int code, String message, Map> header, byte[] body) { + return new ResponseInfo(code >= 200 && code <= 299, code, message, header, body, null); + } + + public static ResponseInfo create(Exception e) { + return new ResponseInfo(false, 0, e.getMessage(), MapUtil.empty(), new byte[0], e); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java new file mode 100644 index 0000000..48a7a14 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/http/support/ResponseResult.java @@ -0,0 +1,97 @@ +package com.njzscloud.common.core.http.support; + +import java.util.List; +import java.util.Map; + +public final class ResponseResult { + /** + * 是否成功, HTTP 状态码 200..299 + */ + public final boolean success; + + /** + * HTTP 状态码 + */ + public final int code; + + /** + * HTTP 状态信息 + */ + public final String status; + + /** + * HTTP 响应头 + */ + public final Map> headers; + + /** + * HTTP 响应体 + */ + public final T body; + + /** + * 错误信息, 在请求发生异常时有值 + */ + public final Exception e; + + private ResponseResult(boolean success, int code, String status, Map> headers, T body, Exception e) { + this.success = success; + this.code = code; + this.status = status; + this.headers = headers; + this.body = body; + this.e = e; + } + + public static ResponseResultBuilder builder() { + return new ResponseResultBuilder(); + } + + public static class ResponseResultBuilder { + private int code; + private String status; + private Map> headers; + private T body; + private Exception e; + + private ResponseResultBuilder() { + } + + public ResponseResultBuilder code(int code) { + this.code = code; + return this; + } + + public ResponseResultBuilder status(String status) { + this.status = status; + return this; + } + + public ResponseResultBuilder headers(Map> headers) { + this.headers = headers; + return this; + } + + public ResponseResultBuilder body(T body) { + this.body = body; + return this; + } + + public ResponseResultBuilder e(Exception e) { + this.e = e; + return this; + } + + public ResponseResult build() { + return new ResponseResult<>( + code >= 200 && code <= 299, + code, + status, + headers, + body, + e + ); + } + + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/Dict.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/Dict.java new file mode 100644 index 0000000..5b4bfe2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/Dict.java @@ -0,0 +1,70 @@ +package com.njzscloud.common.core.ienum; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.njzscloud.common.core.fastjson.serializer.DictObjectDeserializer; +import com.njzscloud.common.core.fastjson.serializer.DictObjectSerializer; +import com.njzscloud.common.core.jackson.serializer.DictDeserializer; +import com.njzscloud.common.core.jackson.serializer.DictSerializer; + +/** + * 字典枚举
+ * 仅两个子接口 DictInt、DictStr
+ * + * @see DictInt + * @see DictStr + * @see DictDeserializer + * @see DictSerializer + * @see DictObjectDeserializer + * @see DictObjectSerializer + */ +@JsonDeserialize(using = DictDeserializer.class) +@JsonSerialize(using = DictSerializer.class) +public interface Dict extends IEnum { + + /** + * 枚举单独序列化时的属性
+ * 存放枚举的 val 属性值 + */ + String ENUM_VAL = "val"; + + /** + * 枚举单独序列化时的属性
+ * 存放枚举的 txt 属性值 + */ + String ENUM_TXT = "txt"; + + /** + * 根据 "值" 获取到对应的枚举对象 + * + * @param val 值 + * @param ds 枚举对象数组 + * @param 值类型 + * @param 枚举类型 + * @return Dict + */ + static > D parse(V val, D[] ds) { + for (D d : ds) { + if (d.getVal().equals(val)) { + return d; + } + } + return null; + } + + /** + * 值 + * + * @return T + */ + T getVal(); + + /** + * 文本表示 + * + * @return String + */ + String getTxt(); + + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictInt.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictInt.java new file mode 100644 index 0000000..6e9c5cb --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictInt.java @@ -0,0 +1,11 @@ +package com.njzscloud.common.core.ienum; + + +/** + * "值" 类型为 Integer
+ * 枚举应实现此接口 + * + * @see DictStr + */ +public interface DictInt extends Dict { +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictStr.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictStr.java new file mode 100644 index 0000000..345cfac --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/DictStr.java @@ -0,0 +1,10 @@ +package com.njzscloud.common.core.ienum; + +/** + * "值" 类型为 String
+ * 枚举应实现此接口 + * + * @see DictInt + */ +public interface DictStr extends Dict { +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/IEnum.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/IEnum.java new file mode 100644 index 0000000..7bf9bb5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/ienum/IEnum.java @@ -0,0 +1,24 @@ +package com.njzscloud.common.core.ienum; + +/** + * 枚举接口 + */ +public interface IEnum { + /** + * 枚举单独序列化时的属性
+ * 存放枚举的全限定类名 + */ + String ENUM_TYPE = "type"; + + /** + * 枚举单独序列化时的属性
+ * 存放枚举的 name 属性值 + */ + String ENUM_NAME = "name"; + + /** + * 枚举单独序列化时的属性
+ * 存放枚举的 ordinal 属性值 + */ + String ENUM_ORDINAL = "ordinal"; +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/Jackson.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/Jackson.java new file mode 100644 index 0000000..0405e00 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/Jackson.java @@ -0,0 +1,229 @@ +package com.njzscloud.common.core.jackson; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.extra.spring.SpringUtil; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.jackson.serializer.BigDecimalModule; +import com.njzscloud.common.core.jackson.serializer.LongModule; +import com.njzscloud.common.core.jackson.serializer.TimeModule; +import lombok.extern.slf4j.Slf4j; + +import java.io.InputStream; +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; +import java.util.Locale; +import java.util.TimeZone; + +/** + * Jackson 工具
+ * 从 Spring 中获取 ObjectMapper + */ +@Slf4j +public class Jackson { + private static final ObjectMapper objectMapper; + private static final XmlMapper xmlMapper; + + static { + ObjectMapper temp; + try { + temp = SpringUtil.getBean(ObjectMapper.class); + } catch (Throwable e) { + log.warn("从 Spring 中获取 ObjectMapper 失败"); + temp = createObjectMapper(); + } + objectMapper = temp; + XmlMapper _xmlMapper; + try { + _xmlMapper = SpringUtil.getBean(XmlMapper.class); + } catch (Throwable e) { + log.warn("从 Spring 中获取 XmlMapper 失败"); + _xmlMapper = createXmlMapper(); + } + xmlMapper = _xmlMapper; + } + + + /** + * 序列化为 JSON 字符串 + * + * @param o 数据 + * @return String + */ + public static String toJsonStr(Object o) { + try { + return objectMapper.writeValueAsString(o); + } catch (JsonProcessingException e) { + log.error("Jackson 序列化失败", e); + throw Exceptions.error(e, "Jackson 序列化失败"); + } + } + + /** + * 序列化为 JSON 字节数组 + * + * @param o 数据 + * @return byte[] + */ + public static byte[] toJsonBytes(Object o) { + try { + return objectMapper.writeValueAsBytes(o); + } catch (JsonProcessingException e) { + log.error("Jackson 序列化失败", e); + throw Exceptions.error(e, "Jackson 序列化失败"); + } + } + + /** + * 反序列化(泛型支持)
+ * 如: new TypeReference<List<String>>(){}, 类型对象建议缓存 + * + * @param json json JSON 字符串 + * @param type 类型 + * @return T + * @see TypeReference + */ + public static T toBean(String json, Type type) { + try { + return objectMapper.readValue(json, objectMapper.getTypeFactory().constructType(type)); + } catch (JsonProcessingException e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + public static T toBean(InputStream json, Type type) { + try { + return objectMapper.readValue(json, objectMapper.getTypeFactory().constructType(type)); + } catch (Exception e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + public static T toBean(byte[] json, Type type) { + try { + return objectMapper.readValue(json, objectMapper.getTypeFactory().constructType(type)); + } catch (Exception e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + + /** + * 序列化为 JSON 字符串 + * + * @param o 数据 + * @return String + */ + public static String toXmlStr(Object o) { + try { + return xmlMapper.writeValueAsString(o); + } catch (JsonProcessingException e) { + log.error("Jackson 序列化失败", e); + throw Exceptions.error(e, "Jackson 序列化失败"); + } + } + + /** + * 序列化为 JSON 字节数组 + * + * @param o 数据 + * @return byte[] + */ + public static byte[] toXmlBytes(Object o) { + try { + return xmlMapper.writeValueAsBytes(o); + } catch (JsonProcessingException e) { + log.error("Jackson 序列化失败", e); + throw Exceptions.error(e, "Jackson 序列化失败"); + } + } + + public static T xmlToBean(String json, Type type) { + try { + return xmlMapper.readValue(json, xmlMapper.getTypeFactory().constructType(type)); + } catch (JsonProcessingException e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + public static T xmlToBean(InputStream json, Type type) { + try { + return xmlMapper.readValue(json, xmlMapper.getTypeFactory().constructType(type)); + } catch (Exception e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + public static T xmlToBean(byte[] json, Type type) { + try { + return xmlMapper.readValue(json, xmlMapper.getTypeFactory().constructType(type)); + } catch (Exception e) { + log.error("Jackson 反序列化失败", e); + throw Exceptions.error(e, "Jackson 反序列化失败"); + } + } + + /** + * 创建 ObjectMapper + * + * @return ObjectMapper + */ + private static ObjectMapper createObjectMapper() { + return new ObjectMapper() + .setLocale(Locale.CHINA) + .setTimeZone(TimeZone.getTimeZone("GMT+8")) + .setDateFormat(new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN)) + .setSerializationInclusion(JsonInclude.Include.ALWAYS) + .configure(SerializationFeature.INDENT_OUTPUT, true) // 格式化输出 + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true) // 对Map中的KeyValue按照Key做排序后再输出。在有些验签的场景需要使用这个Feature + .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + // .configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true) + .configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true) + .registerModules(new TimeModule(), new LongModule(), new BigDecimalModule()) + ; + } + + + private static XmlMapper createXmlMapper() { + return XmlMapper.xmlBuilder() + .defaultLocale(Locale.CHINA) + .defaultTimeZone(TimeZone.getTimeZone("GMT+8")) + .defaultDateFormat(new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN)) + .serializationInclusion(JsonInclude.Include.ALWAYS) + .configure(SerializationFeature.INDENT_OUTPUT, true) + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true) // 对Map中的KeyValue按照Key做排序后再输出。在有些验签的场景需要使用这个Feature + .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .addModules(new TimeModule(), new LongModule(), new BigDecimalModule()) + .build() + ; + } + + /** + * 获取 objectMapper + * + * @return ObjectMapper + */ + public static ObjectMapper objectMapper() { + return objectMapper; + } + + public static XmlMapper xmlMapper() { + return xmlMapper; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalModule.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalModule.java new file mode 100644 index 0000000..dd4d211 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalModule.java @@ -0,0 +1,16 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.databind.deser.std.NumberDeserializers; +import com.fasterxml.jackson.databind.module.SimpleModule; + +import java.math.BigDecimal; + +/** + * BigDecimal 序列化 + */ +public class BigDecimalModule extends SimpleModule { + { + this.addSerializer(BigDecimal.class, new BigDecimalSerializer()) + .addDeserializer(BigDecimal.class, new NumberDeserializers.BigDecimalDeserializer()); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalSerializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalSerializer.java new file mode 100644 index 0000000..216e1f2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/BigDecimalSerializer.java @@ -0,0 +1,22 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.math.BigDecimal; + +/** + * BigDecimal 序列化为字符串 + */ +public class BigDecimalSerializer extends JsonSerializer { + @Override + public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value != null) { + gen.writeString(value.toPlainString()); + } else { + gen.writeNull(); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictDeserializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictDeserializer.java new file mode 100644 index 0000000..c7dc002 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictDeserializer.java @@ -0,0 +1,102 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.core.*; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.node.IntNode; +import com.fasterxml.jackson.databind.node.TextNode; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import com.njzscloud.common.core.ienum.IEnum; +import lombok.extern.slf4j.Slf4j; + +import java.io.IOException; +import java.lang.reflect.Field; + +/** + * Dict 枚举的 Jackson 反序列化器

+ * JSON 格式见对应的序列化器 {@link DictSerializer} + * + * @see Dict + * @see DictInt + * @see DictStr + * @see DictSerializer + */ +@Slf4j +public class DictDeserializer extends JsonDeserializer { + private static final ClassLoader CLASSLOADER = DictDeserializer.class.getClassLoader(); + + @Override + public Dict deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException { + JsonToken currentToken = p.getCurrentToken(); + + if (currentToken == JsonToken.START_OBJECT) { + TreeNode treeNode = p.getCodec().readTree(p); + TreeNode enumType_node = treeNode.get(IEnum.ENUM_TYPE); + String enumTypeField = ((TextNode) enumType_node).textValue(); + TreeNode val_node = treeNode.get(Dict.ENUM_VAL); + + Class clazz; + try { + clazz = CLASSLOADER.loadClass(enumTypeField); + } catch (ClassNotFoundException e) { + throw Exceptions.error(e, "类型加载失败：{}", enumTypeField); + } + if (val_node instanceof TextNode) { + if (DictStr.class.isAssignableFrom(clazz)) { + String val = ((TextNode) val_node).textValue(); + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + String val = ((TextNode) val_node).textValue(); + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(Integer.parseInt(val), constants); + } else { + return null; + } + } else if (val_node instanceof IntNode) { + if (DictStr.class.isAssignableFrom(clazz)) { + int val = ((IntNode) val_node).intValue(); + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(String.valueOf(val), constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + int val = ((IntNode) val_node).intValue(); + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else { + return null; + } + } else { + return null; + } + + } else { + JsonStreamContext context = p.getParsingContext(); + String currentName = context.getCurrentName(); + + Object currentValue = p.getCurrentValue(); + + Class valueClazz = currentValue.getClass(); + try { + Field field = valueClazz.getDeclaredField(currentName); + Class clazz = field.getType(); + if (DictStr.class.isAssignableFrom(clazz)) { + String val = p.getValueAsString(); + DictStr[] constants = (DictStr[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else if (DictInt.class.isAssignableFrom(clazz)) { + int val = p.getValueAsInt(); + DictInt[] constants = (DictInt[]) clazz.getEnumConstants(); + return Dict.parse(val, constants); + } else { + return null; + } + } catch (Exception e) { + log.error("字典枚举反序列化失败", e); + throw Exceptions.error(e, "字典枚举反序列化失败，字段名：{}，值：{}", currentName, currentValue); + } + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictSerializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictSerializer.java new file mode 100644 index 0000000..cc4b4ed --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/DictSerializer.java @@ -0,0 +1,61 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonStreamContext; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import com.njzscloud.common.core.ienum.IEnum; + +import java.io.IOException; + +/** + * Dict 枚举的 Jackson 序列化器

+ * JSON 格式
+ * 1、枚举不是其他对象的属性
+ * 
+ * {
+ *   "type": "", // 枚举全限定类名, 反序列化时会用到
+ *   "name": "", // name 属性
+ *   "ordinal": 0, // ordinal 属性
+ *   "val": 1,  // val 属性(字符串/数字), 反序列化时会用到
+ *   "txt": "1" // txt 属性
+ * }
+ * 2、枚举是其他对象的属性
+ * 
+ * {
+ *   // ... 其他属性
+ *   "原字段名称": 1, // val 属性(字符串/数字), 反序列化时会用到
+ *   "原字段名称Txt": "1" //  txt 属性
+ * }
+ * + * @see Dict + * @see DictInt + * @see DictStr + * @see DictDeserializer + */ +public class DictSerializer extends JsonSerializer { + @Override + public void serialize(Dict value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value == null) { + gen.writeNull(); + } else { + JsonStreamContext ctx = gen.getOutputContext(); + if (ctx.inRoot()) { + gen.writeStartObject(); + gen.writeStringField(IEnum.ENUM_TYPE, value.getClass().getName()); + gen.writeStringField(IEnum.ENUM_NAME, ((Enum) value).name()); + gen.writeNumberField(IEnum.ENUM_ORDINAL, ((Enum) value).ordinal()); + gen.writeObjectField(Dict.ENUM_VAL, value.getVal()); + gen.writeStringField(Dict.ENUM_TXT, value.getTxt()); + gen.writeEndObject(); + } else { + gen.writeObject(value.getVal()); + String currentName = ctx.getCurrentName(); + gen.writeStringField(currentName + "Txt", value.getTxt()); + } + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongModule.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongModule.java new file mode 100644 index 0000000..e960706 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongModule.java @@ -0,0 +1,15 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.databind.deser.std.NumberDeserializers; +import com.fasterxml.jackson.databind.module.SimpleModule; + + +/** + * Long 序列化 + */ +public class LongModule extends SimpleModule { + { + this.addSerializer(Long.class, new LongSerializer()) + .addDeserializer(Long.class, new NumberDeserializers.LongDeserializer(Long.class, null)); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongSerializer.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongSerializer.java new file mode 100644 index 0000000..c54a7ad --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/LongSerializer.java @@ -0,0 +1,21 @@ +package com.njzscloud.common.core.jackson.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; + +/** + * Long 序列化为字符串 + */ +public class LongSerializer extends JsonSerializer { + @Override + public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + if (value != null) { + gen.writeString(value.toString()); + } else { + gen.writeNull(); + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/TimeModule.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/TimeModule.java new file mode 100644 index 0000000..adb18d4 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/jackson/serializer/TimeModule.java @@ -0,0 +1,29 @@ +package com.njzscloud.common.core.jackson.serializer; + +import cn.hutool.core.date.DatePattern; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +/** + * 时间类型序列化 + */ +public class TimeModule extends SimpleModule { + { + this.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))) + .addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))) + .addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))) + .addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))) + .addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))) + .addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/Q.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/Q.java new file mode 100644 index 0000000..93aca4b --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/Q.java @@ -0,0 +1,688 @@ +package com.njzscloud.common.core.thread; + +import lombok.extern.slf4j.Slf4j; + +import java.util.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; + +@Slf4j +@SuppressWarnings("unchecked") +public class Q extends AbstractQueue implements BlockingQueue { + private final ReentrantLock takeLock = new ReentrantLock(); + private final Condition notEmpty = takeLock.newCondition(); + private final ReentrantLock putLock = new ReentrantLock(); + private final Condition notFull = putLock.newCondition(); + + private final int capacity; + private final int standbyCapacity; + private final AtomicInteger count = new AtomicInteger(); + private final AtomicInteger standbyCount = new AtomicInteger(); + + private Node head; + private Node last; + private Node border; + + + public Q() { + this(Integer.MAX_VALUE, Integer.MAX_VALUE); + } + + public Q(int capacity, int standbyCapacity) { + if (capacity <= 0) throw new IllegalArgumentException(); + this.capacity = capacity; + this.standbyCapacity = standbyCapacity; + border = last = head = new Node<>(null); + } + + private void signalNotEmpty() { + final ReentrantLock takeLock = this.takeLock; + takeLock.lock(); + try { + notEmpty.signal(); + } finally { + takeLock.unlock(); + } + } + + private void signalNotFull() { + final ReentrantLock putLock = this.putLock; + putLock.lock(); + try { + notFull.signal(); + } finally { + putLock.unlock(); + } + } + + private void enqueue(Node node) { + last = last.next = node; + } + + private E dequeue() { + Node h = head; + Node first = h.next; + h.next = h; // help GC + head = first; + E x = first.item; + first.item = null; + return x; + } + + private void fullyLock() { + putLock.lock(); + takeLock.lock(); + } + + private void fullyUnlock() { + takeLock.unlock(); + putLock.unlock(); + } + + public int size() { + return count.get(); + } + + public int remainingCapacity() { + return capacity - count.get(); + } + + public void put(E e) throws InterruptedException { + if (e == null) throw new NullPointerException(); + int c = -1; + Node node = new Node(e); + final ReentrantLock putLock = this.putLock; + final AtomicInteger count = this.count; + putLock.lockInterruptibly(); + try { + + while (count.get() == capacity) { + notFull.await(); + } + enqueue(node); + border = node; + c = count.getAndIncrement(); + if (c + 1 < capacity) notFull.signal(); + } finally { + putLock.unlock(); + } + if (c == 0) signalNotEmpty(); + } + + public boolean offer(E e, long timeout, TimeUnit unit) + throws InterruptedException { + + if (e == null) throw new NullPointerException(); + long nanos = unit.toNanos(timeout); + int c = -1; + final ReentrantLock putLock = this.putLock; + final AtomicInteger count = this.count; + putLock.lockInterruptibly(); + try { + while (count.get() == capacity) { + if (nanos <= 0) + return false; + nanos = notFull.awaitNanos(nanos); + } + Node node = new Node<>(e); + enqueue(node); + border = node; + c = count.getAndIncrement(); + if (c + 1 < capacity) notFull.signal(); + } finally { + putLock.unlock(); + } + if (c == 0) + signalNotEmpty(); + return true; + } + + + public boolean offer(E e) { + if (e == null) throw new NullPointerException(); + final AtomicInteger count = this.count; + if (count.get() == capacity) return false; + int c = -1; + Node node = new Node<>(e); + final ReentrantLock putLock = this.putLock; + putLock.lock(); + try { + if (count.get() < capacity) { + enqueue(node); + border = node; + c = count.getAndIncrement(); + if (c + 1 < capacity) notFull.signal(); + } + // log.info("放1：窗口数：{}，备份数：{}", count.get(), standbyCount.get()); + } finally { + putLock.unlock(); + } + if (c == 0) signalNotEmpty(); + return c >= 0; + } + + public boolean offerStandby(E e) { + if (e == null) throw new NullPointerException(); + final AtomicInteger count = this.count; + if (standbyCount.get() == standbyCapacity) return false; + int c = -1; + Node node = new Node<>(e); + final ReentrantLock putLock = this.putLock; + putLock.lock(); + try { + if (standbyCount.get() < standbyCapacity) { + enqueue(node); + c = count.get(); + if (c == capacity) { + c--; + standbyCount.getAndIncrement(); + } else { + border = border.next; + c = count.getAndIncrement(); + } + if (c + 1 < capacity) notFull.signal(); + } + // log.info("放2：窗口数：{}，备份数：{}", count.get(), standbyCount.get()); + } finally { + putLock.unlock(); + } + if (c == 0) signalNotEmpty(); + return c >= 0; + } + + public E take() throws InterruptedException { + E x; + int c = -1; + final AtomicInteger count = this.count; + final ReentrantLock takeLock = this.takeLock; + takeLock.lockInterruptibly(); + try { + while (count.get() == 0) { + notEmpty.await(); + } + if (border.next == null) { + c = count.getAndDecrement(); + } else { + border = border.next; + standbyCount.getAndDecrement(); + c = count.get(); + } + x = dequeue(); + if (c > 1) notEmpty.signal(); + // log.info("取2：窗口数：{}，备份数：{}", count.get(), standbyCount.get()); + } finally { + takeLock.unlock(); + } + if (c == capacity) signalNotFull(); + return x; + } + + public E poll(long timeout, TimeUnit unit) throws InterruptedException { + E x = null; + int c = -1; + long nanos = unit.toNanos(timeout); + final AtomicInteger count = this.count; + final ReentrantLock takeLock = this.takeLock; + takeLock.lockInterruptibly(); + try { + while (count.get() == 0) { + if (nanos <= 0) + return null; + nanos = notEmpty.awaitNanos(nanos); + } + if (border.next == null) { + c = count.getAndDecrement(); + } else { + border = border.next; + standbyCount.getAndDecrement(); + c = count.get(); + } + x = dequeue(); + if (c > 1) notEmpty.signal(); + // log.info("取1：窗口数：{}，备份数：{}", count.get(), standbyCount.get()); + } finally { + takeLock.unlock(); + } + if (c == capacity) + signalNotFull(); + return x; + } + + public E poll() { + final AtomicInteger count = this.count; + if (count.get() == 0) + return null; + E x = null; + int c = -1; + final ReentrantLock takeLock = this.takeLock; + takeLock.lock(); + try { + if (count.get() > 0) { + if (border.next == null) { + c = count.getAndDecrement(); + } else { + border = border.next; + standbyCount.getAndDecrement(); + c = count.get(); + } + x = dequeue(); + if (c > 1) notEmpty.signal(); + } + } finally { + takeLock.unlock(); + } + if (c == capacity) + signalNotFull(); + return x; + } + + public E peek() { + if (count.get() == 0) return null; + final ReentrantLock takeLock = this.takeLock; + takeLock.lock(); + try { + Node first = head.next; + if (first == null) return null; + else return first.item; + } finally { + takeLock.unlock(); + } + } + + void unlink(Node trail, Node p, int borderFlag) { + p.item = null; + trail.next = p.next; + if (last == p) last = trail; + if (borderFlag == 0) { + if (last == p) { + border = trail; + if (count.getAndDecrement() == capacity) notFull.signal(); + } else { + border = p.next; + } + } else if (borderFlag == -1) { + if (last == border) { + if (count.getAndDecrement() == capacity) notFull.signal(); + } else { + border = border.next; + } + } else if (borderFlag == 1) { + standbyCount.getAndDecrement(); + } + } + + public boolean remove(Object o) { + if (o == null) return false; + fullyLock(); + try { + // -1-->左边、0-->边界、1-->右边 + int borderFlag = -1; + for (Node trail = head, p = trail.next; + p != null; + trail = p, p = p.next) { + if (p == border) { + borderFlag = 0; + } else if (borderFlag == 0) { + borderFlag = 1; + } + if (o.equals(p.item)) { + unlink(trail, p, borderFlag); + return true; + } + } + return false; + } finally { + fullyUnlock(); + } + } + + public boolean contains(Object o) { + if (o == null) return false; + fullyLock(); + try { + for (Node p = head.next; p != null; p = p.next) + if (o.equals(p.item)) + return true; + return false; + } finally { + fullyUnlock(); + } + } + + public Object[] toArray() { + fullyLock(); + try { + int size = count.get() + standbyCount.get(); + Object[] a = new Object[size]; + int k = 0; + for (Node p = head.next; p != null; p = p.next) + a[k++] = p.item; + return a; + } finally { + fullyUnlock(); + } + } + + public T[] toArray(T[] a) { + fullyLock(); + try { + int size = count.get() + standbyCount.get(); + if (a.length < size) + a = (T[]) java.lang.reflect.Array.newInstance + (a.getClass().getComponentType(), size); + + int k = 0; + for (Node p = head.next; p != null; p = p.next) + a[k++] = (T) p.item; + if (a.length > k) + a[k] = null; + return a; + } finally { + fullyUnlock(); + } + } + + public String toString() { + fullyLock(); + try { + Node p = head.next; + if (p == null) + return "[]"; + + StringBuilder sb = new StringBuilder(); + sb.append('['); + for (; ; ) { + E e = p.item; + sb.append(e == this ? "(this Collection)" : e); + p = p.next; + if (p == null) + return sb.append(']').toString(); + sb.append(',').append(' '); + } + } finally { + fullyUnlock(); + } + } + + public void clear() { + fullyLock(); + try { + for (Node p, h = head; (p = h.next) != null; h = p) { + h.next = h; + p.item = null; + } + head = last; + // assert head.item == null && head.next == null; + standbyCount.getAndSet(0); + if (count.getAndSet(0) == capacity) + notFull.signal(); + } finally { + fullyUnlock(); + } + } + + public int drainTo(Collection c) { + return drainTo(c, Integer.MAX_VALUE); + } + + public int drainTo(Collection c, int maxElements) { + if (c == null) + throw new NullPointerException(); + if (c == this) + throw new IllegalArgumentException(); + if (maxElements <= 0) return 0; + boolean signalNotFull = false; + final ReentrantLock takeLock = this.takeLock; + takeLock.lock(); + try { + int n = Math.min(maxElements, count.get() + standbyCount.get()); + // count.get provides visibility to first n Nodes + Node h = head; + int i = 0; + int x = 0; + int y = 0; + try { + while (i < n) { + Node p = h.next; + c.add(p.item); + if (border == last) { + x++; + } else { + border = border.next; + y++; + } + p.item = null; + h.next = h; + h = p; + ++i; + } + return n; + } finally { + head = h; + if (x > 0) { + signalNotFull = (count.getAndAdd(-x) == capacity); + } + if (y > 0) { + standbyCount.getAndAdd(-y); + } + } + } finally { + takeLock.unlock(); + if (signalNotFull) + signalNotFull(); + } + } + + public Iterator iterator() { + return new Itr(); + } + + public Spliterator spliterator() { + return new LBQSpliterator(this); + } + + static class Node { + E item; + + Node next; + + Node(E x) { + item = x; + } + } + + static final class LBQSpliterator implements Spliterator { + static final int MAX_BATCH = 1 << 25; // max batch array size; + final Q queue; + Node current; // current node; null until initialized + int batch; // batch size for splits + boolean exhausted; // true when no more nodes + long est; // size estimate + + LBQSpliterator(Q queue) { + this.queue = queue; + this.est = queue.size(); + } + + public long estimateSize() { + return est; + } + + public Spliterator trySplit() { + Node h; + final Q q = this.queue; + int b = batch; + int n = (b <= 0) ? 1 : (b >= MAX_BATCH) ? MAX_BATCH : b + 1; + if (!exhausted && + ((h = current) != null || (h = q.head.next) != null) && + h.next != null) { + Object[] a = new Object[n]; + int i = 0; + Node p = current; + q.fullyLock(); + try { + if (p != null || (p = q.head.next) != null) { + do { + if ((a[i] = p.item) != null) + ++i; + } while ((p = p.next) != null && i < n); + } + } finally { + q.fullyUnlock(); + } + if ((current = p) == null) { + est = 0L; + exhausted = true; + } else if ((est -= i) < 0L) + est = 0L; + if (i > 0) { + batch = i; + return Spliterators.spliterator + (a, 0, i, Spliterator.ORDERED | Spliterator.NONNULL | + Spliterator.CONCURRENT); + } + } + return null; + } + + public void forEachRemaining(Consumer action) { + if (action == null) throw new NullPointerException(); + final Q q = this.queue; + if (!exhausted) { + exhausted = true; + Node p = current; + do { + E e = null; + q.fullyLock(); + try { + if (p == null) + p = q.head.next; + while (p != null) { + e = p.item; + p = p.next; + if (e != null) + break; + } + } finally { + q.fullyUnlock(); + } + if (e != null) + action.accept(e); + } while (p != null); + } + } + + public boolean tryAdvance(Consumer action) { + if (action == null) throw new NullPointerException(); + final Q q = this.queue; + if (!exhausted) { + E e = null; + q.fullyLock(); + try { + if (current == null) + current = q.head.next; + while (current != null) { + e = current.item; + current = current.next; + if (e != null) + break; + } + } finally { + q.fullyUnlock(); + } + if (current == null) + exhausted = true; + if (e != null) { + action.accept(e); + return true; + } + } + return false; + } + + public int characteristics() { + return Spliterator.ORDERED | Spliterator.NONNULL | + Spliterator.CONCURRENT; + } + } + + private class Itr implements Iterator { + + private Node current; + private Node lastRet; + private E currentElement; + + Itr() { + fullyLock(); + try { + current = head.next; + if (current != null) + currentElement = current.item; + } finally { + fullyUnlock(); + } + } + + public boolean hasNext() { + return current != null; + } + + private Node nextNode(Node p) { + for (; ; ) { + Node s = p.next; + if (s == p) + return head.next; + if (s == null || s.item != null) + return s; + p = s; + } + } + + public E next() { + fullyLock(); + try { + if (current == null) + throw new NoSuchElementException(); + E x = currentElement; + lastRet = current; + current = nextNode(current); + currentElement = (current == null) ? null : current.item; + return x; + } finally { + fullyUnlock(); + } + } + + public void remove() { + if (lastRet == null) + throw new IllegalStateException(); + fullyLock(); + try { + Node node = lastRet; + lastRet = null; + // -1-->左边、0-->边界、1-->右边 + int borderFlag = -1; + for (Node trail = head, p = trail.next; + p != null; + trail = p, p = p.next) { + if (p == border) { + borderFlag = 0; + } else if (borderFlag == 0) { + borderFlag = 1; + } + if (p == node) { + unlink(trail, p, borderFlag); + break; + } + } + } finally { + fullyUnlock(); + } + } + } + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java new file mode 100644 index 0000000..801a93c --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/ThreadPool.java @@ -0,0 +1,138 @@ +package com.njzscloud.common.core.thread; + + +import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; + +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +@Slf4j +public class ThreadPool { + private static volatile ThreadPoolExecutor THREAD_POOL; + + public static ThreadPoolExecutor defaultThreadPool() { + if (THREAD_POOL == null) { + synchronized (ThreadPool.class) { + if (THREAD_POOL == null) { + THREAD_POOL = createThreadPool(null, + 10, 200, + 5 * 60, + 20, 2000, + null); + } + } + } + return THREAD_POOL; + } + + public static ThreadPoolExecutor createThreadPool(String poolName, int corePoolSize, int maxPoolSize, long keepAliveSeconds, int windowCapacity, int standbyCapacity, RejectedExecutionHandler abortPolicy) { + RejectedExecutionHandler abortPolicy_ = abortPolicy == null ? new ThreadPoolExecutor.AbortPolicy() : abortPolicy; + Q q = new Q<>(windowCapacity, standbyCapacity); + ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(corePoolSize, maxPoolSize, keepAliveSeconds, TimeUnit.SECONDS, + q, + new DefaultThreadFactory(poolName), + (r, p) -> { + if (!q.offerStandby(r)) { + log.debug("任务队列已满"); + abortPolicy_.rejectedExecution(r, p); + } else { + log.debug("任务已加入备用队列"); + } + } + ); + threadPoolExecutor.allowCoreThreadTimeOut(true); + return threadPoolExecutor; + } + + public static void main(String[] args) { + ThreadPoolExecutor threadPool = defaultThreadPool(); + try { + threadPool.execute(() -> { + System.out.println("1--->" + Thread.currentThread().getName()); + ThreadUtil.sleep(3000); + System.out.println("1<---"); + }); + + threadPool.execute(() -> { + System.out.println("2--->" + Thread.currentThread().getName()); + ThreadUtil.sleep(3000); + System.out.println("2<---"); + }); + + threadPool.execute(() -> { + System.out.println("3--->" + Thread.currentThread().getName()); + ThreadUtil.sleep(3000); + System.out.println("3<---"); + }); + + threadPool.execute(() -> { + System.out.println("4--->" + Thread.currentThread().getName()); + ThreadUtil.sleep(3000); + System.out.println("4<---"); + }); + + threadPool.execute(() -> { + System.out.println("5--->" + Thread.currentThread().getName()); + ThreadUtil.sleep(3000); + System.out.println("5<---"); + }); +/* + threadPool.execute(()->{ + System.out.println("6--->"+Thread.currentThread().getName()); + ThreadUtil.sleep(60000); + System.out.println("6<---"); + }); + + threadPool.execute(()->{ + System.out.println("7--->"+Thread.currentThread().getName()); + ThreadUtil.sleep(70000); + System.out.println("7<---"); + });*/ + } catch (Exception e) { + e.printStackTrace(); + } + ThreadUtil.sleep(300000); + } + + private static class DefaultThreadFactory implements ThreadFactory { + private static final AtomicInteger poolNumber = new AtomicInteger(1); + private final AtomicInteger threadNumber = new AtomicInteger(1); + private final String namePrefix; + + public DefaultThreadFactory(String poolName) { + if (StrUtil.isBlank(poolName)) namePrefix = "pool-" + poolNumber.getAndIncrement() + "-thread-"; + else namePrefix = poolName + "-"; + } + + public DefaultThreadFactory() { + namePrefix = "pool-" + poolNumber.getAndIncrement() + "-thread-"; + } + + @Override + public Thread newThread(@NotNull Runnable r) { + String name = namePrefix + threadNumber.getAndIncrement(); + log.debug("创建新线程：{}", name); + Thread t = new Thread(r, name) { + @Override + public void run() { + try { + super.run(); + } finally { + int i = threadNumber.decrementAndGet(); + log.debug("线程结束：{}，剩余：{}", this.getName(), i - 1); + } + } + }; + if (t.isDaemon()) t.setDaemon(false); + if (t.getPriority() != Thread.NORM_PRIORITY) t.setPriority(Thread.NORM_PRIORITY); + t.setUncaughtExceptionHandler((t1, e) -> log.error("线程异常：{}", t1.getName(), e)); + return t; + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/WindowBlockingQueue.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/WindowBlockingQueue.java new file mode 100644 index 0000000..be23b17 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/thread/WindowBlockingQueue.java @@ -0,0 +1,693 @@ +package com.njzscloud.common.core.thread; + +import lombok.extern.slf4j.Slf4j; + +import java.util.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Consumer; + +@Slf4j +@SuppressWarnings("unchecked") +public class WindowBlockingQueue extends AbstractQueue implements BlockingQueue { + + private final int windowCapacity; + private final int totalCapacity; + private final AtomicInteger totalElementCount = new AtomicInteger(); + private final AtomicInteger windowElementCount = new AtomicInteger(); + private final AtomicInteger standbyElementCount = new AtomicInteger(); + private final ReentrantLock takeLock = new ReentrantLock(); + private final Condition notEmpty = takeLock.newCondition(); + private final ReentrantLock putLock = new ReentrantLock(); + private final Condition notFull = putLock.newCondition(); + private Node head; + private Node border; + private Node last; + + public WindowBlockingQueue() { + this(Integer.MAX_VALUE, Integer.MAX_VALUE); + } + + public WindowBlockingQueue(int totalCapacity, int windowCapacity) { + if (windowCapacity <= 0 || totalCapacity < windowCapacity) throw new IllegalArgumentException(); + this.totalCapacity = totalCapacity; + this.windowCapacity = windowCapacity; + head = border = last = new Node<>(null); + } + + public WindowBlockingQueue(Collection c) { + this(Integer.MAX_VALUE, Integer.MAX_VALUE); + final ReentrantLock putLock = this.putLock; + putLock.lock(); + try { + int n = 0; + for (E e : c) { + if (e == null) + throw new NullPointerException(); + if (n == windowCapacity) + throw new IllegalStateException("Queue full"); + enqueue(new Node<>(e)); + ++n; + } + windowElementCount.set(n); + } finally { + putLock.unlock(); + } + } + + private void signalNotEmpty() { + takeLock.lock(); + try { + notEmpty.signal(); + } finally { + takeLock.unlock(); + } + } + + private void signalNotFull() { + putLock.lock(); + try { + notFull.signal(); + } finally { + putLock.unlock(); + } + } + + private void enqueue(Node node) { + last = last.next = node; + totalElementCount.incrementAndGet(); + } + + private E dequeue() { + Node h = head; + Node first = h.next; + h.next = h; + head = first; + E x = first.item; + first.item = null; + totalElementCount.decrementAndGet(); + return x; + } + + void fullyLock() { + putLock.lock(); + takeLock.lock(); + } + + void fullyUnlock() { + takeLock.unlock(); + putLock.unlock(); + } + + public int size() { + return windowElementCount.get(); + } + + public int remainingCapacity() { + return windowCapacity - windowElementCount.get(); + } + + public void put(E e) throws InterruptedException { + if (e == null) throw new NullPointerException(); + int c = -1; + Node node = new Node<>(e); + final ReentrantLock putLock = this.putLock; + final AtomicInteger count = this.windowElementCount; + putLock.lockInterruptibly(); + try { + while (count.get() == windowCapacity) { + notFull.await(); + } + enqueue(node); + c = count.getAndIncrement(); + if (c + 1 < windowCapacity) + notFull.signal(); + } finally { + putLock.unlock(); + } + if (c == 0) + signalNotEmpty(); + } + + public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException { + if (e == null) throw new NullPointerException(); + long nanos = unit.toNanos(timeout); + int c = -1; + final ReentrantLock putLock = this.putLock; + final AtomicInteger count = this.windowElementCount; + putLock.lockInterruptibly(); + try { + while (count.get() == windowCapacity) { + if (nanos <= 0) + return false; + nanos = notFull.awaitNanos(nanos); + } + enqueue(new Node(e)); + c = count.getAndIncrement(); + if (c + 1 < windowCapacity) + notFull.signal(); + } finally { + putLock.unlock(); + } + if (c == 0) + signalNotEmpty(); + return true; + } + + public boolean offer(E e) { + if (e == null) throw new NullPointerException(); + boolean offered = false; + int c = windowElementCount.get(); + if (c == windowCapacity) return offered; + Node node = new Node<>(e); + final ReentrantLock putLock = this.putLock; + putLock.lock(); + try { + if (windowElementCount.get() < windowCapacity) { + enqueue(node); + offered = true; + c = windowElementCount.incrementAndGet(); + border = node; + if (c < windowCapacity) notFull.signal(); + } + } finally { + // log.debug("1、添加元素：总数：{}、窗口区：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + putLock.unlock(); + } + if (c > 0) signalNotEmpty(); + return offered; + } + + public boolean offerStandby(E e) { + if (e == null) throw new NullPointerException(); + boolean offered = false; + int c = totalElementCount.get(); + if (c == totalCapacity) return offered; + Node node = new Node<>(e); + putLock.lock(); + try { + if (totalElementCount.get() < totalCapacity) { + enqueue(node); + offered = true; + c = windowElementCount.get(); + if (c + 1 <= windowCapacity) { + border = node; + windowElementCount.incrementAndGet(); + } else { + standbyElementCount.incrementAndGet(); + } + if (c + 1 < windowCapacity) notFull.signal(); + } + c = windowElementCount.get(); + } finally { + log.debug("3、添加元素：总数：{}、窗口区：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + putLock.unlock(); + } + if (c != 0) signalNotEmpty(); + return offered; + } + + public E take() throws InterruptedException { + E x; + int c = -1; + takeLock.lockInterruptibly(); + try { + while (windowElementCount.get() == 0) { + notEmpty.await(); + } + x = dequeue(); + if (border.next == null) { + c = windowElementCount.decrementAndGet(); + } else { + border = border.next; + standbyElementCount.decrementAndGet(); + c = windowElementCount.get(); + } + if (c > 0) notEmpty.signal(); + } finally { + log.debug("1、提取元素：总数：{}、窗口：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + takeLock.unlock(); + } + if (c != windowCapacity) signalNotFull(); + return x; + } + + public E poll(long timeout, TimeUnit unit) throws InterruptedException { + E x = null; + int c = -1; + long nanos = unit.toNanos(timeout); + takeLock.lockInterruptibly(); + try { + while (windowElementCount.get() == 0) { + if (nanos <= 0) return null; + nanos = notEmpty.awaitNanos(nanos); + } + x = dequeue(); + if (border.next == null) { + c = windowElementCount.decrementAndGet(); + } else { + border = border.next; + standbyElementCount.decrementAndGet(); + c = windowElementCount.get(); + } + if (c > 0) notEmpty.signal(); + } finally { + // log.debug("2、提取元素：总数：{}、窗口：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + takeLock.unlock(); + } + if (c != windowCapacity) signalNotFull(); + return x; + } + + public E poll() { + if (windowElementCount.get() == 0) return null; + E x = null; + int c = -1; + takeLock.lock(); + try { + if (windowElementCount.get() > 0) { + x = dequeue(); + if (border.next == null) { + c = windowElementCount.decrementAndGet(); + } else { + border = border.next; + standbyElementCount.decrementAndGet(); + c = windowElementCount.get(); + } + if (c > 0) notEmpty.signal(); + } + } finally { + log.debug("3、提取元素：总数：{}、窗口：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + takeLock.unlock(); + } + if (c != windowCapacity) signalNotFull(); + return x; + } + + public E peek() { + if (windowElementCount.get() == 0) + return null; + takeLock.lock(); + try { + Node first = head.next; + if (first == null) + return null; + else + return first.item; + } finally { + takeLock.unlock(); + } + } + + void unlink(Node p, Node trail, boolean overBorder) { + totalElementCount.getAndDecrement(); + if (p == border || !overBorder) { + if (border.next == null) { + windowElementCount.getAndDecrement(); + } else { + border = border.next; + standbyElementCount.decrementAndGet(); + } + } else { + standbyElementCount.decrementAndGet(); + } + p.item = null; + trail.next = p.next; + if (last == p) last = trail; + + if (windowElementCount.get() == windowCapacity) notFull.signal(); + } + + public boolean remove(Object o) { + if (o == null) return false; + fullyLock(); + try { + boolean overBorder = false; + for (Node trail = head, p = trail.next; + p != null; + trail = p, p = p.next) { + if (!overBorder) overBorder = trail == border; + if (o.equals(p.item)) { + unlink(p, trail, overBorder); + return true; + } + } + return false; + } finally { + log.debug("1、删除元素：总数：{}、窗口：{}、备份区：{}", totalElementCount.get(), windowElementCount.get(), standbyElementCount.get()); + fullyUnlock(); + } + } + + public boolean contains(Object o) { + if (o == null) return false; + fullyLock(); + try { + for (Node p = head.next; p != null; p = p.next) + if (o.equals(p.item)) + return true; + return false; + } finally { + fullyUnlock(); + } + } + + public Object[] toArray() { + fullyLock(); + try { + int size = windowElementCount.get(); + Object[] a = new Object[size]; + int k = 0; + for (Node p = head.next; p != null; p = p.next) + a[k++] = p.item; + return a; + } finally { + fullyUnlock(); + } + } + + public T[] toArray(T[] a) { + fullyLock(); + try { + int size = windowElementCount.get(); + if (a.length < size) + a = (T[]) java.lang.reflect.Array.newInstance + (a.getClass().getComponentType(), size); + + int k = 0; + for (Node p = head.next; p != null; p = p.next) + a[k++] = (T) p.item; + if (a.length > k) + a[k] = null; + return a; + } finally { + fullyUnlock(); + } + } + + public String toString() { + fullyLock(); + try { + Node p = head.next; + if (p == null) + return "[]"; + + StringBuilder sb = new StringBuilder(); + sb.append('['); + for (; ; ) { + E e = p.item; + sb.append(e == this ? "(this Collection)" : e); + p = p.next; + if (p == null) + return sb.append(']').toString(); + sb.append(',').append(' '); + } + } finally { + fullyUnlock(); + } + } + + public void clear() { + fullyLock(); + try { + for (Node p, h = head; (p = h.next) != null; h = p) { + h.next = h; + p.item = null; + } + head = last; + totalElementCount.getAndSet(0); + standbyElementCount.getAndSet(0); + if (windowElementCount.getAndSet(0) == windowCapacity) notFull.signal(); + } finally { + fullyUnlock(); + } + } + + public int drainTo(Collection c) { + return drainTo(c, Integer.MAX_VALUE); + } + + public int drainTo(Collection c, int maxElements) { + if (c == null) + throw new NullPointerException(); + if (c == this) + throw new IllegalArgumentException(); + if (maxElements <= 0) + return 0; + boolean signalNotFull = false; + final ReentrantLock takeLock = this.takeLock; + takeLock.lock(); + try { + int n = Math.min(maxElements, windowElementCount.get()); + + Node h = head; + int i = 0; + try { + while (i < n) { + Node p = h.next; + c.add(p.item); + p.item = null; + h.next = h; + h = p; + ++i; + + if (border.next == null) { + windowElementCount.decrementAndGet(); + } else { + border = border.next; + standbyElementCount.decrementAndGet(); + } + } + return n; + } finally { + if (i > 0) { + head = h; + totalElementCount.getAndAdd(-i); + signalNotFull = (windowElementCount.get() == windowCapacity); + } + } + } finally { + takeLock.unlock(); + if (signalNotFull) + signalNotFull(); + } + } + + public Iterator iterator() { + return new Itr(); + } + + public Spliterator spliterator() { + return new LBQSpliterator(this); + } + + static class Node { + E item; + + /** + * One of: + * - the real successor Node + * - this Node, meaning the successor is head.next + * - null, meaning there is no successor (this is the last node) + */ + Node next; + + Node(E x) { + item = x; + } + } + + static final class LBQSpliterator implements Spliterator { + static final int MAX_BATCH = 1 << 25; + final WindowBlockingQueue queue; + Node current; + int batch; + boolean exhausted; + long est; + + LBQSpliterator(WindowBlockingQueue queue) { + this.queue = queue; + this.est = queue.size(); + } + + public long estimateSize() { + return est; + } + + public Spliterator trySplit() { + Node h; + final WindowBlockingQueue q = this.queue; + int b = batch; + int n = (b <= 0) ? 1 : (b >= MAX_BATCH) ? MAX_BATCH : b + 1; + if (!exhausted && + ((h = current) != null || (h = q.head.next) != null) && + h.next != null) { + Object[] a = new Object[n]; + int i = 0; + Node p = current; + q.fullyLock(); + try { + if (p != null || (p = q.head.next) != null) { + do { + if ((a[i] = p.item) != null) + ++i; + } while ((p = p.next) != null && i < n); + } + } finally { + q.fullyUnlock(); + } + if ((current = p) == null) { + est = 0L; + exhausted = true; + } else if ((est -= i) < 0L) + est = 0L; + if (i > 0) { + batch = i; + return Spliterators.spliterator + (a, 0, i, Spliterator.ORDERED | Spliterator.NONNULL | + Spliterator.CONCURRENT); + } + } + return null; + } + + public void forEachRemaining(Consumer action) { + if (action == null) throw new NullPointerException(); + final WindowBlockingQueue q = this.queue; + if (!exhausted) { + exhausted = true; + Node p = current; + do { + E e = null; + q.fullyLock(); + try { + if (p == null) + p = q.head.next; + while (p != null) { + e = p.item; + p = p.next; + if (e != null) + break; + } + } finally { + q.fullyUnlock(); + } + if (e != null) + action.accept(e); + } while (p != null); + } + } + + public boolean tryAdvance(Consumer action) { + if (action == null) throw new NullPointerException(); + final WindowBlockingQueue q = this.queue; + if (!exhausted) { + E e = null; + q.fullyLock(); + try { + if (current == null) + current = q.head.next; + while (current != null) { + e = current.item; + current = current.next; + if (e != null) + break; + } + } finally { + q.fullyUnlock(); + } + if (current == null) + exhausted = true; + if (e != null) { + action.accept(e); + return true; + } + } + return false; + } + + public int characteristics() { + return Spliterator.ORDERED | Spliterator.NONNULL | + Spliterator.CONCURRENT; + } + } + + private class Itr implements Iterator { + private Node current; + private Node lastRet; + private E currentElement; + + Itr() { + fullyLock(); + try { + current = head.next; + if (current != null) + currentElement = current.item; + } finally { + fullyUnlock(); + } + } + + public boolean hasNext() { + return current != null; + } + + /** + * Returns the next live successor of p, or null if no such. + *

+ * Unlike other traversal methods, iterators need to handle both: + * - dequeued nodes (p.next == p) + * - (possibly multiple) interior removed nodes (p.item == null) + */ + private Node nextNode(Node p) { + for (; ; ) { + Node s = p.next; + if (s == p) + return head.next; + if (s == null || s.item != null) + return s; + p = s; + } + } + + public E next() { + fullyLock(); + try { + if (current == null) + throw new NoSuchElementException(); + E x = currentElement; + lastRet = current; + current = nextNode(current); + currentElement = (current == null) ? null : current.item; + return x; + } finally { + fullyUnlock(); + } + } + + public void remove() { + if (lastRet == null) + throw new IllegalStateException(); + fullyLock(); + try { + Node node = lastRet; + lastRet = null; + boolean overBorder = false; + for (Node trail = head, p = trail.next; + p != null; + trail = p, p = p.next) { + if (!overBorder) overBorder = trail == border; + if (p == node) { + unlink(p, trail, overBorder); + break; + } + } + } finally { + fullyUnlock(); + } + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/Tree.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/Tree.java new file mode 100644 index 0000000..5250f71 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/Tree.java @@ -0,0 +1,137 @@ +package com.njzscloud.common.core.tree; + + +import cn.hutool.core.collection.CollUtil; +import com.njzscloud.common.core.utils.GroupUtil; + +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 树型结构工具 + */ +public class Tree { + + /** + * 创建树形数据(倒序) + * + * @param src 源集合 + * @param rootId 根节点 ID + * @param 节点 ID 类型 + * @return List<? extends TreeNode<T>> + */ + public static List> listToTreeDesc(List> src, T rootId) { + return listToTree(src.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList()), TreeNode::getId, TreeNode::getPid, TreeNode::setChildren, rootId, true); + } + + /** + * 创建树形数据(正序) + * + * @param src 源集合 + * @param rootId 根节点 ID + * @param 节点 ID 类型 + * @return List<? extends TreeNode<T>> + */ + public static List> listToTreeAsc(List> src, T rootId) { + return listToTree(src.stream().sorted().collect(Collectors.toList()), TreeNode::getId, TreeNode::getPid, TreeNode::setChildren, rootId, false); + } + + /** + * 创建树形数据(排序) + * + * @param src 源集合 + * @param idFn id 提供函数 + * @param pidFn pid 提供函数 + * @param setChildrenFn 子节点设置函数 + * @param rootId 根节点 ID + * @param reverse 是否倒序 + * @param 源集合元素类型 + * @param 节点 ID 类型 + * @return List<M> + */ + public static , T> List listToTree(List src, Function idFn, Function pidFn, BiConsumer> setChildrenFn, T rootId, boolean reverse) { + if (CollUtil.isEmpty(src)) return Collections.emptyList(); + if (reverse) { + src = src + .stream() + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + } + + Map> pid_treeNode_map = GroupUtil.k_a(src, pidFn); + + for (M m : src) { + setChildrenFn.accept(m, pid_treeNode_map.get(idFn.apply(m))); + } + return CollUtil.emptyIfNull(pid_treeNode_map.get(rootId)); + } + + /** + * 创建树形数据(不排序) + * + * @param src 源集合 + * @param idFn id 提供函数 + * @param pidFn pid 提供函数 + * @param setChildrenFn 子节点设置函数 + * @param rootId 根节点 ID + * @param 源集合元素类型 + * @param 节点 ID 类型 + * @return List<M> + */ + public static List listToTree(List src, Function idFn, Function pidFn, BiConsumer> setChildrenFn, T rootId) { + if (CollUtil.isEmpty(src)) return Collections.emptyList(); + + Map> pid_treeNode_map = GroupUtil.k_a(src, pidFn); + + for (M m : src) { + setChildrenFn.accept(m, pid_treeNode_map.get(idFn.apply(m))); + } + return CollUtil.emptyIfNull(pid_treeNode_map.get(rootId)); + } + + /** + * 扁平化树 + * + * @param src 源集合 树形结构 + * @param getChildrenFn 子节点获取函数 + * @param convert 转换函数, 源集合 元素 -> 结果集合 元素 + * @param 源集合 元素类型 + * @param 结果集合 元素类型 + * @return List<D> + */ + public static List treeToList(List src, Function> getChildrenFn, Function convert) { + List dest; + if (CollUtil.isNotEmpty(src)) { + dest = new ArrayList<>(); + treeToList(src, dest, getChildrenFn, convert); + } else { + dest = Collections.emptyList(); + } + return dest; + } + + /** + * 扁平化树 + * + * @param src 源集合 树形结构 + * @param dest 结果集合 + * @param getChildrenFn 子节点获取函数 + * @param convert 转换函数, 源集合 元素 -> 结果集合 元素 + * @param 源集合 元素类型 + * @param 结果集合 元素类型 + */ + public static void treeToList(List src, List dest, Function> getChildrenFn, Function convert) { + if (CollUtil.isNotEmpty(src)) { + for (S s : src) { + D d = convert.apply(s); + dest.add(d); + List children = getChildrenFn.apply(s); + if (CollUtil.isNotEmpty(children)) { + Tree.treeToList(children, dest, getChildrenFn, convert); + } + } + } + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/TreeNode.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/TreeNode.java new file mode 100644 index 0000000..18faf02 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tree/TreeNode.java @@ -0,0 +1,51 @@ +package com.njzscloud.common.core.tree; + + +import java.util.List; + +/** + * 树结点 + * + * @param Id 的数据类型 + */ +public interface TreeNode extends Comparable> { + /** + * 节点 ID + * + * @return T id + */ + T getId(); + + /** + * 节点 上级 ID + * + * @return T pid + */ + T getPid(); + + /** + * 排序 + * + * @return int + */ + int getSort(); + + /** + * 子节点 + * + * @return List<? extends TreeNode<T>> + */ + List> getChildren(); + + /** + * 设置子节点 + * + * @param children 子节点 + */ + void setChildren(List> children); + + @Override + default int compareTo(TreeNode o) { + return this.getSort() - o.getSort(); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple2.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple2.java new file mode 100644 index 0000000..e495e09 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple2.java @@ -0,0 +1,121 @@ +package com.njzscloud.common.core.tuple; + +import java.util.*; + +/** + * 2 元组 + * + * @param <_0> + * @param <_1> + */ +public class Tuple2<_0, _1> implements Iterable { + + /** + * 元组大小 + */ + public final int size = 2; + /** + * 第 0 个数据 + */ + protected final _0 _0_; + /** + * 第 1 个数据 + */ + protected final _1 _1_; + + /** + * 构造方法 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + */ + protected Tuple2(_0 _0_, _1 _1_) { + this._0_ = _0_; + this._1_ = _1_; + } + + /** + * 创建 Tuple2 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + * @return Tuple2<__0, __1> + */ + public static <__0, __1> Tuple2<__0, __1> create(__0 _0_, __1 _1_) { + return new Tuple2<>(_0_, _1_); + } + + /** + * 获取第 0 个数据 + */ + public _0 get_0() { + return _0_; + } + + /** + * 获取第 1 个数据 + */ + public _1 get_1() { + return _1_; + } + + /** + *

按索引获取数据

+ *

索引越界将返回 null

+ * + * @param index 索引 + * @return T + */ + @SuppressWarnings("unchecked") + public T get(int index) { + switch (index) { + case 0: + return (T) this._0_; + case 1: + return (T) this._1_; + default: + return null; + } + } + + /** + * 获取迭代器 + * + * @return Iterator<Object> + */ + @Override + public Iterator iterator() { + return Collections.unmodifiableList(this.toList()).iterator(); + } + + /** + * 转换成 List + * + * @return List<Object> + */ + public List toList() { + return Arrays.asList(this.toArray()); + } + + /** + * 转换成 数组 + * + * @return Object[] + */ + public Object[] toArray() { + return new Object[]{this._0_, this._1_}; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Tuple2 tuple2 = (Tuple2) o; + return Objects.equals(_0_, tuple2._0_) && Objects.equals(_1_, tuple2._1_); + } + + @Override + public int hashCode() { + return Objects.hash(_0_, _1_); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple3.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple3.java new file mode 100644 index 0000000..4ab7f51 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple3.java @@ -0,0 +1,84 @@ +package com.njzscloud.common.core.tuple; + +/** + * 3 元组 + * + * @param <_0> + * @param <_1> + * @param <_2> + */ +public class Tuple3<_0, _1, _2> extends Tuple2<_0, _1> { + + /** + * 元组大小 + */ + public final int size = 3; + + /** + * 第 2 个数据 + */ + protected final _2 _2_; + + /** + * 构造方法 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + * @param _2_ 第 2 个数据 + */ + protected Tuple3(_0 _0_, _1 _1_, _2 _2_) { + super(_0_, _1_); + this._2_ = _2_; + } + + /** + * 创建 Tuple3 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + * @param _2_ 第 2 个数据 + * @return Tuple3<__0, __1, __2> + */ + public static <__0, __1, __2> Tuple3<__0, __1, __2> create(__0 _0_, __1 _1_, __2 _2_) { + return new Tuple3<>(_0_, _1_, _2_); + } + + /** + * 获取第 2 个数据 + */ + public _2 get_2() { + return _2_; + } + + /** + *

按索引获取数据

+ *

索引越界将返回 null

+ * + * @param index 索引 + * @return T + */ + @Override + @SuppressWarnings("unchecked") + public T get(int index) { + switch (index) { + case 0: + return (T) this._0_; + case 1: + return (T) this._1_; + case 2: + return (T) this._2_; + default: + return null; + } + } + + /** + * 转换成 数组 + * + * @return Object[] + */ + @Override + public Object[] toArray() { + return new Object[]{this._0_, this._1_, this._2_}; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple4.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple4.java new file mode 100644 index 0000000..242b4c3 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/tuple/Tuple4.java @@ -0,0 +1,87 @@ +package com.njzscloud.common.core.tuple; + +/** + * 4 元组 + * + * @param <_0> + * @param <_1> + * @param <_2> + * @param <_3> + */ +public class Tuple4<_0, _1, _2, _3> extends Tuple3<_0, _1, _2> { + /** + * 元组大小 + */ + public final int size = 4; + /** + * 第 3 个数据 + */ + protected final _3 _3_; + + /** + * 构造方法 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + * @param _2_ 第 2 个数据 + * @param _3_ 第 3 个数据 + */ + protected Tuple4(_0 _0_, _1 _1_, _2 _2_, _3 _3_) { + super(_0_, _1_, _2_); + this._3_ = _3_; + } + + /** + * 创建 Tuple4 + * + * @param _0_ 第 0 个数据 + * @param _1_ 第 1 个数据 + * @param _2_ 第 2 个数据 + * @param _3_ 第 3 个数据 + * @return Tuple3<__0, __1, __2, __3> + */ + public static <__0, __1, __2, __3> Tuple4<__0, __1, __2, __3> create(__0 _0_, __1 _1_, __2 _2_, __3 _3_) { + return new Tuple4<>(_0_, _1_, _2_, _3_); + } + + /** + * 获取第 3 个数据 + */ + public _3 get_3() { + return _3_; + } + + /** + *

按索引获取数据

+ *

索引越界将返回 null

+ * + * @param index 索引 + * @return T + */ + @Override + @SuppressWarnings("unchecked") + public T get(int index) { + switch (index) { + case 0: + return (T) this._0_; + case 1: + return (T) this._1_; + case 2: + return (T) this._2_; + case 3: + return (T) this._3_; + default: + return null; + } + } + + /** + * 转换成 数组 + * + * @return Object[] + */ + @Override + public Object[] toArray() { + return new Object[]{this._0_, this._1_, this._2_, this._3_}; + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Globs.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Globs.java new file mode 100644 index 0000000..b7ca86f --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Globs.java @@ -0,0 +1,195 @@ +package com.njzscloud.common.core.utils; + +import java.util.regex.PatternSyntaxException; + +/** + * @see sun.nio.fs.Globs + */ +public class Globs { + private static final String regexMetaChars = ".^$+{[]|()"; + private static final String globMetaChars = "\\*?[{"; + private static final char EOL = 0; // TBD + + private Globs() { + } + + private static boolean isRegexMeta(char c) { + return regexMetaChars.indexOf(c) != -1; + } + + private static boolean isGlobMeta(char c) { + return globMetaChars.indexOf(c) != -1; + } + + private static char next(String glob, int i) { + if (i < glob.length()) { + return glob.charAt(i); + } + return EOL; + } + + /** + * Creates a regex pattern from the given glob expression. + * + * @throws PatternSyntaxException + */ + private static String toRegexPattern(String globPattern, boolean isDos) { + boolean inGroup = false; + StringBuilder regex = new StringBuilder("^"); + + int i = 0; + while (i < globPattern.length()) { + char c = globPattern.charAt(i++); + switch (c) { + case '\\': + // escape special characters + if (i == globPattern.length()) { + throw new PatternSyntaxException("No character to escape", globPattern, i - 1); + } + char next = globPattern.charAt(i++); + if (isGlobMeta(next) || isRegexMeta(next)) { + regex.append('\\'); + } + regex.append(next); + break; + case '/': + if (isDos) { + regex.append("\\\\"); + } else { + regex.append(c); + } + break; + case '[': + // don't match name separator in class + if (isDos) { + regex.append("[[^\\\\]&&["); + } else { + regex.append("[[^/]&&["); + } + if (next(globPattern, i) == '^') { + // escape the regex negation char if it appears + regex.append("\\^"); + i++; + } else { + // negation + if (next(globPattern, i) == '!') { + regex.append('^'); + i++; + } + // hyphen allowed at start + if (next(globPattern, i) == '-') { + regex.append('-'); + i++; + } + } + boolean hasRangeStart = false; + char last = 0; + while (i < globPattern.length()) { + c = globPattern.charAt(i++); + if (c == ']') { + break; + } + if (c == '/' || (isDos && c == '\\')) { + throw new PatternSyntaxException("Explicit 'name separator' in class", + globPattern, i - 1); + } + // TBD: how to specify ']' in a class? + if (c == '\\' || c == '[' || + c == '&' && next(globPattern, i) == '&') { + // escape '\', '[' or "&&" for regex class + regex.append('\\'); + } + regex.append(c); + + if (c == '-') { + if (!hasRangeStart) { + throw new PatternSyntaxException("Invalid range", + globPattern, i - 1); + } + if ((c = next(globPattern, i++)) == EOL || c == ']') { + break; + } + if (c < last) { + throw new PatternSyntaxException("Invalid range", + globPattern, i - 3); + } + regex.append(c); + hasRangeStart = false; + } else { + hasRangeStart = true; + last = c; + } + } + if (c != ']') { + throw new PatternSyntaxException("Missing ']", globPattern, i - 1); + } + regex.append("]]"); + break; + case '{': + if (inGroup) { + throw new PatternSyntaxException("Cannot nest groups", + globPattern, i - 1); + } + regex.append("(?:(?:"); + inGroup = true; + break; + case '}': + if (inGroup) { + regex.append("))"); + inGroup = false; + } else { + regex.append('}'); + } + break; + case ',': + if (inGroup) { + regex.append(")|(?:"); + } else { + regex.append(','); + } + break; + case '*': + if (next(globPattern, i) == '*') { + // crosses directory boundaries + regex.append(".*"); + i++; + } else { + // within directory boundary + if (isDos) { + regex.append("[^\\\\]*"); + } else { + regex.append("[^/]*"); + } + } + break; + case '?': + if (isDos) { + regex.append("[^\\\\]"); + } else { + regex.append("[^/]"); + } + break; + + default: + if (isRegexMeta(c)) { + regex.append('\\'); + } + regex.append(c); + } + } + + if (inGroup) { + throw new PatternSyntaxException("Missing '}", globPattern, i - 1); + } + + return regex.append('$').toString(); + } + + static String toUnixRegexPattern(String globPattern) { + return toRegexPattern(globPattern, false); + } + + static String toWindowsRegexPattern(String globPattern) { + return toRegexPattern(globPattern, true); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/GroupUtil.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/GroupUtil.java new file mode 100644 index 0000000..d2c8273 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/GroupUtil.java @@ -0,0 +1,625 @@ +package com.njzscloud.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.jackson.Jackson; + +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.BinaryOperator; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 对象分组工具 + */ +public class GroupUtil { + + // region K-O + + // region Collection + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param 值类型 / 源集合元素类型 + * @param 键类型 + * @return Map<K, SV> + */ + public static Map k_o(Collection src, Function kf) { + return k_o(src, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, V> + */ + public static Map k_o(Collection src, Function kf, Function vf) { + return k_o(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 源集合元素

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 值类型 / 源集合元素类型 + * @param 键类型 + * @param Map 类型 + * @return Map<K, SV> + */ + public static > M k_o(Collection src, Function kf, Supplier mf) { + return k_o(src, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, V> + */ + public static > M k_o(Collection src, Function kf, Function vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + + return k_o(src.stream(), kf, vf, mf); + } + + // endregion + + // region Collection 索引 + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ *

kf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @return Map<K, VT> + */ + public static Map k_o(Collection src, BiFunction kf) { + return k_o(src, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ * Map 为 HashMap, 键为 kf, 值为 vf

+ *

kf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf K 提供函数 + * @param vf V 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, V> + */ + public static Map k_o(Collection src, BiFunction kf, Function vf) { + return k_o(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 源集合元素

+ *

kf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf K 提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param Map 类型 + * @return Map<K, SV> + */ + public static > M k_o(Collection src, BiFunction kf, Supplier mf) { + return k_o(src, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ *

kf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf K 提供函数 + * @param vf V 提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, V> + */ + public static > M k_o(Collection src, BiFunction kf, Function vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + + M map = mf.get(); + + int i = 0; + for (SV sv : src) { + K k = kf.apply(i, sv); + if (map.containsKey(k)) throw Exceptions.error("重复键：{}", sv); + V v = vf.apply(sv); + map.put(k, v); + i++; + } + return map; + } + + /** + *

分组

+ * Map 为 HashMap, 键为 kf, 值为 vf

+ *

vf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, V> + */ + public static Map k_o(Collection src, Function kf, BiFunction vf) { + return k_o(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ * Map 为 mf, 键为 kf, 值为 vf

+ *

vf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, V> + */ + public static > M k_o(Collection src, Function kf, BiFunction vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + + M map = mf.get(); + + int i = 0; + for (SV sv : src) { + K k = kf.apply(sv); + if (map.containsKey(k)) throw Exceptions.error("重复键：{}", sv); + V v = vf.apply(i, sv); + map.put(k, v); + i++; + } + return map; + } + + /** + *

分组

+ * Map 为 HashMap, 键为 kf, 值为 vf

+ *

kf vf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, V> + */ + public static Map k_o(Collection src, BiFunction kf, BiFunction vf) { + return k_o(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ * Map 为 mf, 键为 kf, 值为 vf

+ *

kf vf 中可得到 源集合元素 索引

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, V> + */ + public static > M k_o(Collection src, BiFunction kf, BiFunction vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + + M map = mf.get(); + + int i = 0; + for (SV sv : src) { + K k = kf.apply(i, sv); + if (map.containsKey(k)) throw Exceptions.error("重复键：{}", sv); + V v = vf.apply(i, sv); + map.put(k, v); + i++; + } + return map; + } + // endregion + + // region Stream + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @return Map<K, SV> + */ + public static Map k_o(Stream stream, Function kf) { + return k_o(stream, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, V> + */ + public static Map k_o(Stream stream, Function kf, Function vf) { + return k_o(stream, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param Map 类型 + * @return Map<K, SV> + */ + public static > M k_o(Stream stream, Function kf, Supplier mf) { + return k_o(stream, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, V> + */ + public static > M k_o(Stream stream, Function kf, Function vf, Supplier mf) { + if (stream == null) return MapUtil.empty(null); + BinaryOperator op = (oldVal, val) -> { + throw Exceptions.error("值【{}】与【{}】对应的键重复", Jackson.toJsonStr(oldVal), Jackson.toJsonStr(val)); + }; + return stream.collect(Collectors.toMap(kf, vf, op, mf)); + } + // endregion + + // endregion + + // region K-A + + // region Collection + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param 键类型 + * @param 源集合元素类型 + * @return Map<K, List<V>> + */ + public static Map> k_a(Collection src, Function kf) { + return k_a(src, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, List<V>> + */ + public static Map> k_a(Collection src, Function kf, Function vf) { + return k_a(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 源集合元素

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param Map 类型 + * @return Map<K, List<SV>> + */ + public static >> M k_a(Collection src, Function kf, Supplier mf) { + return k_a(src, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, List<V>> + */ + public static >> M k_a(Collection src, Function kf, Function vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + return src.stream().collect(Collectors.groupingBy(kf, mf, Collectors.mapping(vf, Collectors.toList()))); + } + // endregion + + // region Stream + + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param 键类型 + * @param 源集合元素类型 + * @return Map<K, List<V>> + */ + public static Map> k_a(Stream stream, Function kf) { + return k_a(stream, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, List<V>> + */ + public static Map> k_a(Stream stream, Function kf, Function vf) { + return k_a(stream, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 源集合元素

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param Map 类型 + * @return Map<K, List<SV>> + */ + public static >> M k_a(Stream stream, Function kf, Supplier mf) { + return k_a(stream, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, List<V>> + */ + public static >> M k_a(Stream stream, Function kf, Function vf, Supplier mf) { + if (stream == null) return MapUtil.empty(null); + return stream.collect(Collectors.groupingBy(kf, mf, Collectors.mapping(vf, Collectors.toList()))); + } + // endregion + + // endregion + + // region K-S + // region Collection + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @return Map<K, Set<SV>> + */ + public static Map> k_s(Collection src, Function kf) { + return k_s(src, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, Set<V>> + */ + public static Map> k_s(Collection src, Function kf, Function vf) { + return k_s(src, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 键类型 + * @param 源集合元素类型 + * @param Map 类型 + * @return Map<K, Set<SV>> + */ + public static >> M k_s(Collection src, Function kf, Supplier mf) { + return k_s(src, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param src 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, Set<V>> + */ + public static >> M k_s(Collection src, Function kf, Function vf, Supplier mf) { + if (CollUtil.isEmpty(src)) return MapUtil.empty(null); + return src.stream().collect(Collectors.groupingBy(kf, mf, Collectors.mapping(vf, Collectors.toSet()))); + } + // endregion + + // region Stream + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 源集合元素

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @return Map<K, Set<SV>> + */ + public static Map> k_s(Stream stream, Function kf) { + return k_s(stream, kf, it -> it, HashMap::new); + } + + /** + *

分组

+ *

Map 为 HashMap, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @return Map<K, Set<V>> + */ + public static Map> k_s(Stream stream, Function kf, Function vf) { + return k_s(stream, kf, vf, HashMap::new); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param mf Map 提供函数 + * @param 键类型 + * @param 源集合元素类型 + * @param Map 类型 + * @return Map<K, Set<SV>> + */ + public static >> M k_s(Stream stream, Function kf, Supplier mf) { + return k_s(stream, kf, it -> it, mf); + } + + /** + *

分组

+ *

Map 为 mf, 键为 kf, 值为 vf

+ * + * @param stream 源集合 + * @param kf 键提供函数 + * @param vf 值提供函数 + * @param mf Map 提供函数 + * @param 源集合元素类型 + * @param 键类型 + * @param 值类型 + * @param Map 类型 + * @return Map<K, Set<V>> + */ + public static >> M k_s(Stream stream, Function kf, Function vf, Supplier mf) { + if (stream == null) return MapUtil.empty(null); + return stream.collect(Collectors.groupingBy(kf, mf, Collectors.mapping(vf, Collectors.toSet()))); + } + // endregion + + // endregion + +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Key.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Key.java new file mode 100644 index 0000000..2b3d672 --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/Key.java @@ -0,0 +1,41 @@ +package com.njzscloud.common.core.utils; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.ex.Exceptions; +import lombok.AccessLevel; +import lombok.RequiredArgsConstructor; + +/** + *

缓存/Redis 等 Key

+ */ +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +public class Key { + private final String keyTpl; + + /** + *

创建 KEY

+ *

KEY 字符串模板：可用：{名称} 做为占位符

+ * + * @param keyTpl KEY 字符串模板 + * @return KEY 对象 + */ + public static Key create(String keyTpl) { + Assert.notEmpty(keyTpl, () -> Exceptions.error("KEY 字符串模板不能为空")); + keyTpl = keyTpl.replaceAll("\\{\\w+}", "{}"); + return new Key(keyTpl); + } + + /** + *

填充 KEY 模板

+ * + * @param params 填充参数 + * @return key 值 + */ + public String fill(Object... params) { + int count = StrUtil.count(keyTpl, "{}"); + Assert.isTrue(count == params.length, + () -> Exceptions.error("占位符数量：[{}]与参数数量：[{}]不一致", count, params.length)); + return StrUtil.format(keyTpl, params); + } +} diff --git a/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/R.java b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/R.java new file mode 100644 index 0000000..bc2b11d --- /dev/null +++ b/njzscloud-common/njzscloud-common-core/src/main/java/com/njzscloud/common/core/utils/R.java @@ -0,0 +1,243 @@ +package com.njzscloud.common.core.utils; + +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.njzscloud.common.core.ex.ExceptionMsg; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.jackson.Jackson; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * 响应信息主体 + * + * @param + */ +@Getter +@SuppressWarnings("unchecked") +public final class R { + /** + *

错误码 >= 0

+ *

0 --> 没有错误

+ *

其他 --> 有错误

+ */ + private final int code; + /** + * 是否成功 + */ + private final boolean success; + + /** + * 简略信息 + */ + private final String msg; + /** + * 响应数据 + */ + private T data; + /** + * 详细信息 + */ + private Object message; + + private R(T data, ExceptionMsg msg, Object message) { + this(msg.code, data, msg.msg, message); + } + + @JsonCreator + private R(@JsonProperty("code") int code, + @JsonProperty("data") T data, + @JsonProperty("msg") String msg, + @JsonProperty("message") Object message) { + this.data = data; + this.code = code; + this.msg = msg; + this.message = message; + this.success = code == 0; + } + + /** + * 成功，响应码：0，响应信息：成功，详细信息：null，响应数据：null + * + * @param 响应数据的类型 + * @return R<D> + */ + public static R success() { + return new R<>(0, null, "成功", null); + } + + /** + * 成功，响应码：0，响应信息：成功，详细信息：null + * + * @param data 响应数据 + * @param 响应数据的类型 + * @return R<D> + */ + public static R success(D data) { + return new R<>(0, data, "成功", null); + } + + /** + * 成功，响应码：0，详细信息：null + * + * @param data 响应数据 + * @param msg 响应信息 + * @param 响应数据的类型 + * @return R<D> + */ + public static R success(D data, String msg) { + return new R<>(0, data, msg, null); + } + + /** + * 失败，响应码：11111，响应信息：系统异常！，详细信息：null，响应数据：null + * + * @param 响应数据的类型 + * @return R<D> + */ + public static R failed() { + return new R<>(null, ExceptionMsg.SYS_EXP_MSG, null); + } + + /** + * 失败，详细信息：null，响应数据：null + * + * @param msg 简略错误信息 + * @param 响应数据的类型 + * @return R<D> + * @see ExceptionMsg + */ + public static R failed(ExceptionMsg msg) { + return new R<>(null, msg, null); + } + + public static R failed(ExceptionMsg msg, Object message) { + return new R<>(null, msg, message); + } + + public static R failed(ExceptionMsg msg, String message, Object... param) { + if (StrUtil.isNotBlank(message) && param != null && param.length > 0) { + message = StrUtil.format(message, param); + } + return new R<>(null, msg, message); + } + + /** + * 失败，详细信息：null + * + * @param data 响应数据 + * @param msg 简略错误信息 + * @param 响应数据的类型 + * @return R<D> + * @see ExceptionMsg + */ + public static R failed(D data, ExceptionMsg msg) { + return new R<>(null, msg, null); + } + + public static R failed(D data, ExceptionMsg msg, Object message) { + return new R<>(null, msg, message); + } + + /** + * 设置响应数据 + * + * @param data 响应数据 + * @return R<D> + */ + public R setData(T data) { + this.data = data; + return this; + } + + /** + *

添加响应数据

+ *

需确保 data 为 Map 类型且 Key 为 String，data 为 null 时，会新建

+ * + * @param key 键 + * @param val 值 + * @return R<T> + */ + public R> put(String key, V val) { + if (this.data == null) { + R> r = new R<>(this.code, new HashMap<>(), this.msg, this.message); + r.data.put(key, val); + return r; + } else if (Map.class.isAssignableFrom(data.getClass())) { + ((Map) this.data).put(key, val); + return (R>) this; + } + + throw Exceptions.error("响应信息构建失败"); + } + + /** + *

添加响应数据

+ *

需确保 data 为 List 类型，data 为 null 时，会新建

+ * + * @param val 值 + * @return R<T> + */ + public R> add(V val) { + if (this.data == null) { + R> r = new R<>(this.code, new ArrayList<>(), this.msg, this.message); + r.data.add(val); + return r; + } else if (List.class.isAssignableFrom(data.getClass())) { + ((List) this.data).add(val); + return (R>) this; + } + throw Exceptions.error("响应信息构建失败"); + } + + /** + * 设置详细信息 + * + * @param message 详细信息 + * @return R<T> + */ + public R setMessage(Object message) { + this.message = message; + return this; + } + + /** + * 设置详细信息 + * + * @param message 消息字符串模板，占位符：{} + * @param param 占位符参数 + * @return R<T> + */ + public R setMessage(String message, Object... param) { + if (StrUtil.isNotBlank(message) && param != null && param.length > 0) { + message = StrUtil.format(message, param); + } + this.message = message; + return this; + } + + /** + *

转换

+ *

将响应数据转换为其他对象

+ *

code、msg、message 不变化

+ * + * @param converter 转换器 + * @param 新响应数据的类型 + * @return R<D> + */ + public R convert(Function converter) { + D d = converter.apply(this.data); + return new R<>(this.code, d, this.msg, this.message); + } + + @Override + public String toString() { + return Jackson.toJsonStr(this); + } +} diff --git a/njzscloud-common/njzscloud-common-email/pom.xml b/njzscloud-common/njzscloud-common-email/pom.xml new file mode 100644 index 0000000..0c70ad6 --- /dev/null +++ b/njzscloud-common/njzscloud-common-email/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-email + + + 8 + 8 + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + org.springframework.boot + spring-boot-starter-mail + + + + + + org.springframework.boot + spring-boot-starter + + + + + + org.springframework.boot + spring-boot-configuration-processor + + + diff --git a/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java new file mode 100644 index 0000000..6b187d5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/MailMessage.java @@ -0,0 +1,234 @@ +package com.njzscloud.common.email; + +import cn.hutool.core.lang.Assert; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.tuple.Tuple2; +import lombok.Getter; + +import javax.mail.util.ByteArrayDataSource; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +/** + * 邮件消息 + */ +@Getter +public class MailMessage { + /** + * 收件人邮箱 + */ + private final List tos; + /** + * 邮件主题 + */ + private final String subject; + /** + * 邮件内容 + */ + private final String content; + /** + * 是否为 HTML + */ + private final boolean html; + /** + * 附件列表，0-->附件名称、1-->附件内容 + */ + private final List> attachmentList; + + /** + * 创建邮件消息 + * + * @param tos 收件人邮箱 + * @param subject 邮件主题 + * @param content 邮件内容 + * @param html 是否为 HTML + * @param attachmentList 附件列表，0-->附件名称、1-->附件内容 + */ + private MailMessage(List tos, String subject, String content, boolean html, List> attachmentList) { + this.tos = tos; + this.subject = subject; + this.content = content; + this.html = html; + this.attachmentList = attachmentList; + } + + /** + * 获取构建器 + * + * @return 构建器对象 + */ + public static Builder builder() { + return new Builder(); + } + + /** + * 构建器 + */ + public static class Builder { + /** + * 收件人邮箱 + */ + private List tos; + /** + * 邮件主题 + */ + private String subject; + /** + * 邮件内容 + */ + private String content; + /** + * 是否为 HTML + */ + private boolean html; + /** + * 附件列表，0-->附件名称、1-->附件内容 + */ + private List> attachmentList; + + /** + * 添加收件人邮箱 + * + * @param to 收件人邮箱 + * @return 构建器对象 + */ + public Builder addTo(String to) { + if (this.tos == null) { + this.tos = new ArrayList<>(); + } + this.tos.add(to); + return this; + } + + /** + * 设置收件人邮箱 + * + * @param tos 收件人邮箱 + * @return 构建器对象 + */ + public Builder tos(List tos) { + this.tos = tos; + return this; + } + + /** + * 设置邮件主题 + * + * @param subject 邮件主题 + * @return 构建器对象 + */ + public Builder subject(String subject) { + this.subject = subject; + return this; + } + + /** + * 设置邮件内容 + * + * @param content 邮件内容（常规内容） + * @return 构建器对象 + */ + public Builder content(String content) { + this.content = content; + this.html = false; + return this; + } + + /** + * 设置邮件内容 + * + * @param content 邮件内容（HTML内容） + * @return 构建器对象 + */ + public Builder htmlContent(String content) { + this.content = content; + this.html = true; + return this; + } + + /** + * 设置附件列表 + * + * @param attachmentList 附件列表，0-->附件名称、1-->附件内容 + * @return 构建器对象 + */ + public Builder attachmentList(List> attachmentList) { + this.attachmentList = attachmentList; + return this; + } + + /** + * 添加附件 + * + * @param filename 附件名称 + * @param in 附件 + * @param mime 内容类型 + * @return 构建器对象 + */ + public Builder addAttachment(String filename, InputStream in, String mime) { + Assert.notBlank(filename, "附件名称不能为空"); + Assert.notNull(in, "附件不能为空"); + Assert.notBlank(mime, "内容类型不能为空"); + if (this.attachmentList == null) { + this.attachmentList = new ArrayList<>(); + } + ByteArrayDataSource dataSource; + try (InputStream is = in) { + dataSource = new ByteArrayDataSource(is, mime); + } catch (IOException e) { + throw Exceptions.error(e, "附件读取失败"); + } + this.attachmentList.add(Tuple2.create(filename, dataSource)); + return this; + } + + /** + * 添加附件 + * + * @param filename 附件名称 + * @param bytes 附件 + * @param mime 内容类型 + * @return 构建器对象 + */ + public Builder addAttachment(String filename, byte[] bytes, String mime) { + return addAttachment(filename, new ByteArrayInputStream(bytes), mime); + } + + /** + * 添加附件，内容类型默认：application/octet-stream + * + * @param filename 附件名称 + * @param bytes 附件 + * @return 构建器对象 + */ + public Builder addAttachment(String filename, byte[] bytes) { + return addAttachment(filename, new ByteArrayInputStream(bytes), Mime.BINARY); + } + + /** + * 添加附件，内容类型默认：application/octet-stream + * + * @param filename 附件名称 + * @param in 附件 + * @return 构建器对象 + */ + public Builder addAttachment(String filename, InputStream in) { + return addAttachment(filename, in, Mime.BINARY); + } + + /** + * 构建邮件消息 + * + * @return MailMessage + */ + public MailMessage build() { + Assert.isTrue(this.tos != null && !this.tos.isEmpty(), "收件人邮箱不能为空"); + Assert.notBlank(this.subject, "邮件主题不能为空"); + return new MailMessage(this.tos, this.subject, this.content, this.html, this.attachmentList); + } + } +} diff --git a/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/util/EMailUtil.java b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/util/EMailUtil.java new file mode 100644 index 0000000..58b618d --- /dev/null +++ b/njzscloud-common/njzscloud-common-email/src/main/java/com/njzscloud/common/email/util/EMailUtil.java @@ -0,0 +1,98 @@ +package com.njzscloud.common.email.util; + +import cn.hutool.extra.spring.SpringUtil; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.email.MailMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.mail.MailAuthenticationException; +import org.springframework.mail.MailException; +import org.springframework.mail.MailParseException; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; + +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; +import javax.mail.util.ByteArrayDataSource; +import java.util.Collections; +import java.util.List; + +/** + * 电子邮件工具 + */ +@Slf4j +public class EMailUtil { + private static final String FROM; + private static final JavaMailSender MAIL_SENDER; + + static { + MAIL_SENDER = SpringUtil.getBean(JavaMailSender.class); + FROM = SpringUtil.getProperty("spring.mail.username"); + } + + /** + * 发送简单文本邮件 + * + * @param to 接收者邮件 + * @param subject 邮件主题 + * @param content 邮件内容 + */ + public void sendSimpleMail(String to, String subject, String content) { + sendSimpleMail(Collections.singletonList(to), subject, content); + } + + /** + * 发送简单文本邮件 + * + * @param tos 接收者邮件 + * @param subject 邮件主题 + * @param content 邮件内容 + */ + public void sendSimpleMail(List tos, String subject, String content) { + SimpleMailMessage message = new SimpleMailMessage(); + message.setFrom(FROM); + message.setTo(tos.toArray(new String[0])); + message.setSubject(subject); + message.setText(content); + try { + MAIL_SENDER.send(message); + } catch (MailException e) { + throw Exceptions.error(e, + e instanceof MailParseException ? "邮件消息解析失败" : + e instanceof MailAuthenticationException ? "邮件服务器认证失败" : "邮件发送失败", e); + } + } + + /** + * 发送复杂邮件 + * + * @param mailMessage 消息 + */ + public void sendComplexMail(MailMessage mailMessage) { + MimeMessage message = MAIL_SENDER.createMimeMessage(); + try { + MimeMessageHelper helper = new MimeMessageHelper(message, true); + helper.setFrom(FROM); + helper.setTo(mailMessage.getTos().toArray(new String[0])); + helper.setSubject(mailMessage.getSubject()); + helper.setText(mailMessage.getContent(), mailMessage.isHtml()); + List> attachmentList = mailMessage.getAttachmentList(); + if (attachmentList != null && !attachmentList.isEmpty()) { + for (Tuple2 dataSource : attachmentList) { + helper.addAttachment(dataSource.get_0(), dataSource.get_1()); + } + } + } catch (MessagingException e) { + throw Exceptions.error(e, "邮件创建失败"); + } + + try { + MAIL_SENDER.send(message); + } catch (MailException e) { + throw Exceptions.error(e, + e instanceof MailParseException ? "邮件消息解析失败" : + e instanceof MailAuthenticationException ? "邮件服务器认证失败" : "邮件发送失败"); + } + } +} diff --git a/njzscloud-common/njzscloud-common-gen/pom.xml b/njzscloud-common/njzscloud-common-gen/pom.xml new file mode 100644 index 0000000..0007809 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-gen + jar + + njzscloud-common-gen + http://maven.apache.org + + + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + + com.njzscloud + njzscloud-common-mvc + provided + + + + com.njzscloud + njzscloud-common-mp + provided + + + + com.ibeetl + beetl + 3.19.2.RELEASE + + + + diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplController.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplController.java new file mode 100644 index 0000000..0ab1f26 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplController.java @@ -0,0 +1,94 @@ +package com.njzscloud.common.gen; + +import com.njzscloud.common.core.http.constant.Mime; +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.gen.support.Generator; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * 代码模板 + */ +@Slf4j +@RestController +@RequestMapping("/sys_tpl") +@RequiredArgsConstructor +public class SysTplController { + + private final SysTplService sysTplService; + + /** + * 新增 + * + * @param sysTplEntity 数据 + */ + @PostMapping("/add") + public R add(@RequestBody SysTplEntity sysTplEntity) { + sysTplService.add(sysTplEntity); + return R.success(); + } + + /** + * 修改 + * + * @param sysTplEntity 数据 + */ + @PostMapping("/modify") + public R modify(@RequestBody SysTplEntity sysTplEntity) { + sysTplService.modify(sysTplEntity); + return R.success(); + } + + /** + * 删除 + * + * @param ids Ids + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + sysTplService.del(ids); + return R.success(); + } + + @PostMapping("/generate") + public void generate(@RequestParam String tplName, @RequestBody(required = false) Map data, HttpServletResponse response) { + try { + response.setContentType(Mime.u8Val(Mime.TXT)); + Generator.generate(tplName, data, response.getOutputStream()); + } catch (IOException e) { + log.error(e.getMessage()); + } + } + + /** + * 详情 + * + * @param id Id + * @return SysTplEntity 结果 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(sysTplService.detail(id)); + } + + /** + * 分页查询 + * + * @param sysTplEntity 筛选条件 + * @param pageParam 分页参数 + * @return PageResult<SysTplEntity> 分页结果 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SysTplEntity sysTplEntity) { + return R.success(sysTplService.paging(pageParam, sysTplEntity)); + } + +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplEntity.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplEntity.java new file mode 100644 index 0000000..6638c4b --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplEntity.java @@ -0,0 +1,55 @@ +package com.njzscloud.common.gen; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njzscloud.common.gen.contant.TplCategory; +import com.njzscloud.common.gen.support.Tpl; +import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.util.Map; + +/** + * 代码模板 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName(value = "sys_tpl", autoResultMap = true) +public class SysTplEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 模板名称 + */ + private String tplName; + + /** + * 模板类型; 字典编码：tpl_category + */ + private TplCategory tplCategory; + + /** + * 模板内容 + */ + @TableField(typeHandler = JsonTypeHandler.class) + private Tpl tpl; + + /** + * 模型数据 + */ + @TableField(typeHandler = JsonTypeHandler.class) + private Map modelData; + +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplMapper.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplMapper.java new file mode 100644 index 0000000..a52049c --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplMapper.java @@ -0,0 +1,12 @@ +package com.njzscloud.common.gen; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 代码模板 + */ +@Mapper +public interface SysTplMapper extends BaseMapper { + +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplService.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplService.java new file mode 100644 index 0000000..e30d03f --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/SysTplService.java @@ -0,0 +1,87 @@ +package com.njzscloud.common.gen; + +import cn.hutool.core.map.MapUtil; +import com.njzscloud.common.gen.support.TemplateEngine; +import com.njzscloud.common.gen.support.Tpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 代码模板 + */ +@Slf4j +@Service +public class SysTplService extends ServiceImpl implements IService { + + /** + * 新增 + * + * @param sysTplEntity 数据 + */ + public void add(SysTplEntity sysTplEntity) { + Tpl tpl = sysTplEntity.getTpl(); + if (tpl == null) { + sysTplEntity.setTpl(new Tpl()); + } + + Map modelData = sysTplEntity.getModelData(); + if (modelData == null) { + sysTplEntity.setModelData(MapUtil.empty()); + } + this.save(sysTplEntity); + } + + /** + * 修改 + * + * @param sysTplEntity 数据 + */ + @Transactional(rollbackFor = Exception.class) + public void modify(SysTplEntity sysTplEntity) { + Long id = sysTplEntity.getId(); + SysTplEntity oldData = this.getById(id); + TemplateEngine.rmEngine(oldData.getTplName()); + this.updateById(sysTplEntity); + } + + /** + * 删除 + * + * @param ids Ids + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + * + * @param id Id + * @return SysTplEntity 结果 + */ + public SysTplEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + * + * @param sysTplEntity 筛选条件 + * @param pageParam 分页参数 + * @return PageResult<SysTplEntity> 分页结果 + */ + public PageResult paging(PageParam pageParam, SysTplEntity sysTplEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysTplEntity))); + } + +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/config/GenAutoConfiguration.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/config/GenAutoConfiguration.java new file mode 100644 index 0000000..d9544e3 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/config/GenAutoConfiguration.java @@ -0,0 +1,30 @@ +package com.njzscloud.common.gen.config; + +import com.njzscloud.common.gen.support.DbMetaData; +import com.njzscloud.common.gen.SysTplController; +import com.njzscloud.common.gen.SysTplService; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +@Configuration +@MapperScan("com.njzscloud.common.gen") +public class GenAutoConfiguration { + + @Bean + public SysTplService sysTplService() { + return new SysTplService(); + } + + @Bean + public SysTplController sysTplController(SysTplService sysTplService) { + return new SysTplController(sysTplService); + } + + @Bean + public DbMetaData dbMetaData(DataSource dataSource) { + return new DbMetaData(dataSource); + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/contant/TplCategory.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/contant/TplCategory.java new file mode 100644 index 0000000..45b4b7c --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/contant/TplCategory.java @@ -0,0 +1,24 @@ +package com.njzscloud.common.gen.contant; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import com.njzscloud.common.core.ienum.DictStr; + +/** + * 字典代码：tpl_category + * 字典名称：模板类型 + */ +@Getter +@RequiredArgsConstructor +public enum TplCategory implements DictStr { + Controller("Controller", "Controller"), + Service("Service", "Service"), + Mapper("Mapper", "Mapper"), + MapperXml("MapperXml", "MapperXml"), + Entity("Entity", "Entity"), + ; + private final String val; + private final String txt; +} + + diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Btl.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Btl.java new file mode 100644 index 0000000..5725f62 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Btl.java @@ -0,0 +1,40 @@ +package com.njzscloud.common.gen.support; + +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import org.beetl.core.Context; +import org.beetl.core.Function; + +import java.util.Map; + +public final class Btl { + public static final Function toCamelCase = (Object[] paras, Context ctx) -> StrUtil.toCamelCase(paras[0].toString()); + public static final Function upperFirst = (Object[] paras, Context ctx) -> StrUtil.upperFirst(paras[0].toString()); + public static final Function isBlank = (Object[] paras, Context ctx) -> StrUtil.isBlank(paras[0].toString()); + public static final Function subAfter = (Object[] paras, Context ctx) -> StrUtil.subAfter(paras[0].toString(), paras[1].toString(), false); + public static final Function sqlDataTypeMap = new Function() { + private final Map> map = MapUtil.>builder() + .put("DEFAULT", MapUtil.builder().put("importStatement", "").put("dataType", "").build()) + .put("VARCHAR", MapUtil.builder().put("importStatement", "").put("dataType", "String").build()) + .put("CHAR", MapUtil.builder().put("importStatement", "").put("dataType", "String").build()) + .put("LONGTEXT", MapUtil.builder().put("importStatement", "").put("dataType", "String").build()) + .put("TEXT", MapUtil.builder().put("importStatement", "").put("dataType", "String").build()) + .put("BIT", MapUtil.builder().put("importStatement", "").put("dataType", "Boolean").build()) + .put("TINYINT", MapUtil.builder().put("importStatement", "").put("dataType", "Integer").build()) + .put("SMALLINT", MapUtil.builder().put("importStatement", "").put("dataType", "Integer").build()) + .put("MEDIUMINT", MapUtil.builder().put("importStatement", "").put("dataType", "Integer").build()) + .put("INT", MapUtil.builder().put("importStatement", "").put("dataType", "Integer").build()) + .put("BIGINT", MapUtil.builder().put("importStatement", "").put("dataType", "Long").build()) + .put("DOUBLE", MapUtil.builder().put("importStatement", "").put("dataType", "DOUBLE").build()) + .put("DECIMAL", MapUtil.builder().put("importStatement", "import java.math.BigDecimal;").put("dataType", "BigDecimal").build()) + .put("DATE", MapUtil.builder().put("importStatement", "import java.time.LocalDate;").put("dataType", "LocalDate").build()) + .put("TIME", MapUtil.builder().put("importStatement", "import java.time.LocalTime;").put("dataType", "LocalTime").build()) + .put("DATETIME", MapUtil.builder().put("importStatement", "import java.time.LocalDateTime;").put("dataType", "LocalDateTime").build()) + .build(); + + @Override + public Object call(Object[] paras, Context ctx) { + return map.getOrDefault(paras[0].toString().toUpperCase(), map.get("DEFAULT")); + } + }; +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/DbMetaData.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/DbMetaData.java new file mode 100644 index 0000000..4e8cf26 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/DbMetaData.java @@ -0,0 +1,73 @@ +package com.njzscloud.common.gen.support; + +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Slf4j +@RequiredArgsConstructor +public class DbMetaData { + private final DataSource dataSource; + + public List> getMetaData(String tableName) { + try (Connection connection = dataSource.getConnection()) { + return getTables(connection, tableName); + } catch (Exception e) { + log.error("获取数据库元数据失败", e); + return Collections.emptyList(); + } + } + + private List> getTableColumns(Connection conn, String tableName) throws Exception { + List> columns = new ArrayList<>(); + + DatabaseMetaData metaData = conn.getMetaData(); + try (ResultSet columnsData = metaData.getColumns(null, null, tableName, "%")) { + while (columnsData.next()) { + columns.add(MapUtil.builder() + .put("name", columnsData.getString("COLUMN_NAME")) + .put("dataType", columnsData.getString("TYPE_NAME")) + .put("size", columnsData.getInt("COLUMN_SIZE")) + .put("nullable", columnsData.getInt("NULLABLE") == DatabaseMetaData.columnNullable) + .put("defaultValue", columnsData.getString("COLUMN_DEF")) + .put("comment", columnsData.getString("REMARKS")) + .build() + ); + } + } + try (ResultSet primaryKeyData = metaData.getPrimaryKeys(null, null, tableName)) { + while (primaryKeyData.next()) { + String primaryKeyColumn = primaryKeyData.getString("COLUMN_NAME"); + columns.forEach(column -> column.put("primaryKey", column.get("name").equals(primaryKeyColumn))); + } + } + return columns; + } + + private List> getTables(Connection conn, String tableName) throws Exception { + List> tableInfos = new ArrayList<>(); + DatabaseMetaData metaData = conn.getMetaData(); + try (ResultSet tablesData = metaData.getTables(null, null, StrUtil.isNotBlank(tableName) ? tableName : "%", new String[]{"TABLE"})) { + while (tablesData.next()) { + String tableName_ = tablesData.getString("TABLE_NAME"); + List> columns = getTableColumns(conn, tableName_); + tableInfos.add(MapUtil.builder() + .put("name", tableName_) + .put("comment", tablesData.getString("REMARKS")) + .put("columns", columns) + .build()); + } + } + return tableInfos; + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Generator.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Generator.java new file mode 100644 index 0000000..6d82af8 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Generator.java @@ -0,0 +1,55 @@ +package com.njzscloud.common.gen.support; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njzscloud.common.core.jackson.Jackson; +import com.njzscloud.common.core.tuple.Tuple3; +import com.njzscloud.common.gen.SysTplEntity; +import com.njzscloud.common.gen.SysTplService; +import lombok.extern.slf4j.Slf4j; + +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Slf4j +public class Generator { + private static Tuple3 generate0(String tplName, Map data) { + DbMetaData dbMetaData = SpringUtil.getBean(DbMetaData.class); + SysTplService sysTplService = SpringUtil.getBean(SysTplService.class); + List> table = dbMetaData.getMetaData(data.getOrDefault("tableName", "%").toString()); + SysTplEntity tplEntity = sysTplService.getOne(Wrappers.lambdaQuery() + .eq(SysTplEntity::getTplName, tplName)); + + Tpl tpl = tplEntity.getTpl(); + Map modelData = tplEntity.getModelData(); + HashMap map = new HashMap<>(modelData); + map.put("table", CollUtil.isNotEmpty(table) ? table.get(0) : MapUtil.empty()); + map.putAll(data); + log.info("数据：{}", Jackson.toJsonStr(map)); + TemplateEngine templateEngine = TemplateEngine.getEngine(tplName, tpl); + String content = templateEngine.renderContent(map); + String dir = templateEngine.renderDir(map); + String filename = templateEngine.renderFilename(map); + return Tuple3.create(dir, filename, content); + } + + public static void generate(String tplName, Map data) { + Tuple3 tuple3 = generate0(tplName, data == null ? MapUtil.empty() : data); + String dir = tuple3.get_0(); + FileUtil.mkdir(dir); + FileUtil.writeUtf8String(tuple3.get_2(), dir + "/" + tuple3.get_1()); + } + + public static void generate(String tplName, Map data, OutputStream out) { + Tuple3 tuple3 = generate0(tplName, data == null ? MapUtil.empty() : data); + log.info("结果：{}", tuple3.get_2()); + IoUtil.write(out, false, tuple3.get_2().getBytes(StandardCharsets.UTF_8)); + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/TemplateEngine.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/TemplateEngine.java new file mode 100644 index 0000000..02ea757 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/TemplateEngine.java @@ -0,0 +1,75 @@ +package com.njzscloud.common.gen.support; + +import com.njzscloud.common.core.jackson.Jackson; +import lombok.extern.slf4j.Slf4j; +import org.beetl.core.Configuration; +import org.beetl.core.GroupTemplate; +import org.beetl.core.Template; +import org.beetl.core.resource.MapResourceLoader; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Slf4j +public class TemplateEngine { + + private static final GroupTemplate GT; + private static final MapResourceLoader LOADER = new MapResourceLoader(); + private static final Map ENGINE = new ConcurrentHashMap<>(); + + static { + GroupTemplate getTemplate_; + try { + Configuration cfg = Configuration.defaultConfiguration(); + getTemplate_ = new GroupTemplate(LOADER, cfg); + getTemplate_.registerFunction("toCamelCase", Btl.toCamelCase); + getTemplate_.registerFunction("upperFirst", Btl.upperFirst); + getTemplate_.registerFunction("isBlank", Btl.isBlank); + getTemplate_.registerFunction("subAfter", Btl.subAfter); + getTemplate_.registerFunction("sqlDataTypeMap", Btl.sqlDataTypeMap); + } catch (IOException e) { + getTemplate_ = null; + log.error("模板引擎初始化失败", e); + } + GT = getTemplate_; + } + + private final String tplName; + + private TemplateEngine(String tplName, Tpl tpl) { + this.tplName = tplName; + LOADER.put(tplName + "-content", tpl.getContent()); + LOADER.put(tplName + "-dir", tpl.getDir()); + LOADER.put(tplName + "-filename", tpl.getFilename()); + } + + public static TemplateEngine getEngine(String tplName, Tpl tpl) { + return ENGINE.computeIfAbsent(tplName, key -> new TemplateEngine(tplName, tpl)); + } + + public static void rmEngine(String tplName) { + ENGINE.remove(tplName); + LOADER.remove(tplName + "-content"); + LOADER.remove(tplName + "-dir"); + LOADER.remove(tplName + "-filename"); + } + + public String render(String tplName, Map data) { + Template template = GT.getTemplate(tplName); + template.binding(data); + return template.render(); + } + + public String renderContent(Map data) { + return render(tplName + "-content", data); + } + + public String renderDir(Map data) { + return render(tplName + "-dir", data); + } + + public String renderFilename(Map data) { + return render(tplName + "-filename", data); + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Tpl.java b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Tpl.java new file mode 100644 index 0000000..e507357 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/java/com/njzscloud/common/gen/support/Tpl.java @@ -0,0 +1,26 @@ +package com.njzscloud.common.gen.support; + +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@Setter +@ToString +@Accessors(chain = true) +public class Tpl { + private String content; + private String dir; + private String filename; + + public String getContent() { + return content == null ? "" : content; + } + + public String getDir() { + return dir == null ? "" : dir; + } + + public String getFilename() { + return filename == null ? "" : filename; + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-gen/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..fb215b7 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.gen.config.GenAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/controller.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/controller.btl new file mode 100644 index 0000000..8855e1d --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/controller.btl @@ -0,0 +1,74 @@ +<% +var entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix)); +var controllerClass = upperFirst(entityName) + "Controller"; +var entityClass = upperFirst(entityName) + "Entity"; +var entityInstance = entityName + "Entity"; +var serviceClass = upperFirst(entityName) + "Service"; +var serviceInstance = entityName + "Service"; +var mapperClass = upperFirst(entityName) + "Mapper"; +var baseUrl = table.name; +%> +package ${basePackage}.controller; + +import lombok.extern.slf4j.Slf4j; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import ${basePackage}.entity.${entityClass}; +import ${basePackage}.service.${serviceClass}; + +/** + * ${table.comment} + */ +@Slf4j +@RestController +@RequestMapping("/${baseUrl}") +@RequiredArgsConstructor +public class ${controllerClass} { + private final ${serviceClass} ${serviceInstance}; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody ${entityClass} ${entityInstance}) { + ${serviceInstance}.add(${entityInstance}); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody ${entityClass} ${entityInstance}) { + ${serviceInstance}.modify(${entityInstance}); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + ${serviceInstance}.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R<${entityClass}> detail(@RequestParam Long id) { + return R.success(${serviceInstance}.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, ${entityClass} ${entityInstance}) { + return R.success(${serviceInstance}.paging(pageParam, ${entityInstance})); + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/entity.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/entity.btl new file mode 100644 index 0000000..3defff6 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/entity.btl @@ -0,0 +1,56 @@ +<% +var entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix)); +var controllerClass = upperFirst(entityName) + "Controller"; +var entityClass = upperFirst(entityName) + "Entity"; +var entityInstance = entityName + "Entity"; +var serviceClass = upperFirst(entityName) + "Service"; +var serviceInstance = entityName + "Service"; +var mapperClass = upperFirst(entityName) + "Mapper"; +var baseUrl = table.name; +%> +package ${basePackage}.entity; + +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; +import com.baomidou.mybatisplus.annotation.*; +import lombok.ToString; +<%for(column in table.columns) { + var map = sqlDataTypeMap(column.dataType); +%> +<%if(!isBlank(map.importStatement)){%> +${map.importStatement} +<%}%> +<%}%> + +/** + * ${table.comment} + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("${table.name}") +public class ${entityClass} { + +<% +for(column in table.columns){ + var map = sqlDataTypeMap(column.dataType); +%> + /** + * ${column.comment} + */ + <%if(column.primaryKey){%> + @TableId(type = IdType.ASSIGN_ID) + <%}%> + <%if(column.name == "creator_id" || column.name == "create_time"){%> + @TableId(type = IdType.ASSIGN_ID) + <%}else if(column.name == "modifier_id" || column.name == "modify_time"){%> + @TableField(fill = FieldFill.INSERT_UPDATE) + <%}else if(column.name == "deleted"){%> + @TableLogic + <%}%> + private ${map.dataType} ${toCamelCase(column.name)}; + +<%}%> +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper.btl new file mode 100644 index 0000000..2e28cdc --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper.btl @@ -0,0 +1,22 @@ +<% +var entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix)); +var controllerClass = upperFirst(entityName) + "Controller"; +var entityClass = upperFirst(entityName) + "Entity"; +var entityInstance = entityName + "Entity"; +var serviceClass = upperFirst(entityName) + "Service"; +var serviceInstance = entityName + "Service"; +var mapperClass = upperFirst(entityName) + "Mapper"; +var baseUrl = table.name; +%> +package ${basePackage}.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import ${basePackage}.entity.${entityClass}; + +/** + * ${table.comment} + */ +@Mapper +public interface ${mapperClass} extends BaseMapper<${entityClass}> { +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper_xml.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper_xml.btl new file mode 100644 index 0000000..2590e5c --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/mapper_xml.btl @@ -0,0 +1,14 @@ +<% +var entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix)); +var controllerClass = upperFirst(entityName) + "Controller"; +var entityClass = upperFirst(entityName) + "Entity"; +var entityInstance = entityName + "Entity"; +var serviceClass = upperFirst(entityName) + "Service"; +var serviceInstance = entityName + "Service"; +var mapperClass = upperFirst(entityName) + "Mapper"; +var baseUrl = table.name; +%> + + + + diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/service.btl b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/service.btl new file mode 100644 index 0000000..2572aa5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/service.btl @@ -0,0 +1,69 @@ +<% +var entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix)); +var controllerClass = upperFirst(entityName) + "Controller"; +var entityClass = upperFirst(entityName) + "Entity"; +var entityInstance = entityName + "Entity"; +var serviceClass = upperFirst(entityName) + "Service"; +var serviceInstance = entityName + "Service"; +var mapperClass = upperFirst(entityName) + "Mapper"; +var baseUrl = table.name; +%> +package ${basePackage}.service; + +import java.util.List; +import lombok.extern.slf4j.Slf4j; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import ${basePackage}.entity.${entityClass}; +import ${basePackage}.mapper.${mapperClass}; + +/** + * ${table.comment} + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class ${serviceClass} extends ServiceImpl<${mapperClass}, ${entityClass}> implements IService<${entityClass}> { + + /** + * 新增 + */ + public void add(${entityClass} ${entityInstance}) { + this.save(${entityInstance}); + } + + /** + * 修改 + */ + public void modify(${entityClass} ${entityInstance}) { + this.updateById(${entityInstance}); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public ${entityClass} detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult<${entityClass}> paging(PageParam pageParam, ${entityClass} ${entityInstance}) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.<${entityClass}>query(${entityInstance}))); + } +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl.json b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl.json new file mode 100644 index 0000000..6cb9982 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl.json @@ -0,0 +1,10 @@ +{ + "tplName": "Service", + "tplCategory": "Service", + "tpl": { + "dir": "", + "filename": "", + "content": "<%\nvar entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix));\nvar controllerClass = upperFirst(entityName) + \"Controller\";\nvar entityClass = upperFirst(entityName) + \"Entity\";\nvar entityInstance = entityName + \"Entity\";\nvar serviceClass = upperFirst(entityName) + \"Service\";\nvar serviceInstance = entityName + \"Service\";\nvar mapperClass = upperFirst(entityName) + \"Mapper\";\nvar baseUrl = entityName + \"Service\";\n%>\npackage ${basePackage}.service;\n\nimport lombok.extern.slf4j.Slf4j;\nimport lombok.RequiredArgsConstructor;\nimport org.springframework.stereotype.Service;\nimport com.baomidou.mybatisplus.extension.service.IService;\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport com.baomidou.mybatisplus.core.toolkit.Wrappers;\nimport com.njzscloud.common.mp.support.PageParam;\nimport com.njzscloud.common.mp.support.PageResult;\nimport java.util.List;\nimport org.springframework.transaction.annotation.Transactional;\nimport ${basePackage}.entity.${entityClass};\nimport ${basePackage}.mapper.${mapperClass};\n\n/**\n * ${table.comment}\n */\n@Slf4j\n@Service\n@RequiredArgsConstructor\npublic class ${serviceClass} extends ServiceImpl<${mapperClass}, ${entityClass}> implements IService<${entityClass}> {\n\n /**\n * 新增\n */\n public void add(${entityClass} ${entityInstance}) {\n this.save(${entityInstance});\n }\n\n /**\n * 修改\n */\n public void modify(${entityClass} ${entityInstance}) {\n this.updateById(${entityInstance});\n }\n\n /**\n * 删除\n */\n @Transactional(rollbackFor = Exception.class)\n public void del(List ids) {\n this.removeBatchByIds(ids);\n }\n\n /**\n * 详情\n */\n public ${entityClass} detail(Long id) {\n return this.getById(id);\n }\n\n /**\n * 分页查询\n */\n public PageResult<${entityClass}> paging(PageParam pageParam, ${entityClass} ${entityInstance}) {\n return PageResult.of(this.page(pageParam.toPage(), Wrappers.<${entityClass}>query(${entityInstance})));\n }\n}\n" + }, + "modelData": {} +} diff --git a/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl_update.json b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl_update.json new file mode 100644 index 0000000..4957a26 --- /dev/null +++ b/njzscloud-common/njzscloud-common-gen/src/main/resources/templates/tpl_update.json @@ -0,0 +1,8 @@ +{ + "id": "1947531036271337474", + "tpl": { + "dir": "", + "filename": "", + "content": "<%\nvar entityName = toCamelCase(isBlank(prefix) ? table.name : subAfter(table.name, prefix));\nvar controllerClass = upperFirst(entityName) + \"Controller\";\nvar entityClass = upperFirst(entityName) + \"Entity\";\nvar entityInstance = entityName + \"Entity\";\nvar serviceClass = upperFirst(entityName) + \"Service\";\nvar serviceInstance = entityName + \"Service\";\nvar baseUrl = entityName + \"Service\";\n%>\npackage ${basePackage}.entity;\n\nimport lombok.Getter;\nimport lombok.Setter;\nimport lombok.experimental.Accessors;\nimport com.baomidou.mybatisplus.annotation.*;\nimport lombok.ToString;\n<%for(column in table.columns) {\n var map = sqlDataTypeMap(column.dataType);\n%>\n<%if(!isBlank(map.importStatement)){%>\n${map.importStatement}\n<%}%>\n<%}%>\n\n/**\n * ${table.comment}\n */\n@Getter\n@Setter\n@ToString\n@Accessors(chain = true)\n@TableName(\"${table.name}\")\npublic class ${entityClass} {\n\n<%\nfor(column in table.columns){\n var map = sqlDataTypeMap(column.dataType);\n%>\n /**\n * ${column.comment}\n */\n <%if(column.primaryKey){%>\n @TableId(type = IdType.ASSIGN_ID)\n <%}%>\n <%if(column.name == \"creator_id\" || column.name == \"create_time\"){%>\n @TableId(type = IdType.ASSIGN_ID)\n <%}else if(column.name == \"modifier_id\" || column.name == \"modify_time\"){%>\n @TableField(fill = FieldFill.INSERT_UPDATE)\n <%}else if(column.name == \"deleted\"){%>\n @TableLogic\n <%}%>\n private ${map.dataType} ${toCamelCase(column.name)};\n\n<%}%>\n}\n" + } +} diff --git a/njzscloud-common/njzscloud-common-job/pom.xml b/njzscloud-common/njzscloud-common-job/pom.xml new file mode 100644 index 0000000..0b0e0ba --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-job + + + 8 + 8 + UTF-8 + 2.4.1 + + + + com.njzscloud + njzscloud-common-core + provided + + + + + com.xuxueli + xxl-job-core + + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + + org.springframework.boot + spring-boot-starter + + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + diff --git a/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlAdminProperties.java b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlAdminProperties.java new file mode 100644 index 0000000..4a9ae17 --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlAdminProperties.java @@ -0,0 +1,26 @@ +package com.njzscloud.common.job; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class XxlAdminProperties { + /** + * 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。 + * 执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册； + */ + private String protocol = "http"; + private String ip; + private String port; + private String contextPath = "/xxl-job-admin"; + + /** + * 执行器通讯TOKEN [选填]：非空时启用； + */ + private String accessToken = "XXLJob"; + + public String getAddresses() { + return protocol + "://" + ip + ":" + port + contextPath; + } +} diff --git a/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlExecutorProperties.java b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlExecutorProperties.java new file mode 100644 index 0000000..1c5d31d --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlExecutorProperties.java @@ -0,0 +1,34 @@ +package com.njzscloud.common.job; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class XxlExecutorProperties { + /** + * 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册 + */ + private String appName; + + /** + * 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP + * ，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务" + */ + private String ip; + + /** + * 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； + */ + private Integer port = 0; + + /** + * 执行器运行日志文件存储磁盘路径 [选填] ：需要对该路径拥有读写权限；为空则使用默认路径； + */ + private String logPath = "logs/xxl-job"; + + /** + * 执行器日志保存天数 [选填] ：值大于3时生效，启用执行器Log文件定期清理功能，否则不生效； + */ + private Integer logRetentionDays = 30; +} diff --git a/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobAutoConfiguration.java b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobAutoConfiguration.java new file mode 100644 index 0000000..9210b2b --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobAutoConfiguration.java @@ -0,0 +1,28 @@ +package com.njzscloud.common.job; + +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties({XxlJobProperties.class}) +@ConditionalOnProperty(value = "xxl-job.enable", havingValue = "true") +public class XxlJobAutoConfiguration { + + @Bean + public XxlJobSpringExecutor xxlJobSpringExecutor(XxlJobProperties xxlJobProperties) { + XxlAdminProperties xxlAdminProperties = xxlJobProperties.getAdmin(); + XxlExecutorProperties xxlExecutorProperties = xxlJobProperties.getExecutor(); + XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); + xxlJobSpringExecutor.setAdminAddresses(xxlAdminProperties.getAddresses()); + xxlJobSpringExecutor.setAppname(xxlExecutorProperties.getAppName()); + xxlJobSpringExecutor.setIp(xxlExecutorProperties.getIp()); + xxlJobSpringExecutor.setPort(xxlExecutorProperties.getPort()); + xxlJobSpringExecutor.setAccessToken(xxlAdminProperties.getAccessToken()); + xxlJobSpringExecutor.setLogPath(xxlExecutorProperties.getLogPath()); + xxlJobSpringExecutor.setLogRetentionDays(xxlExecutorProperties.getLogRetentionDays()); + return xxlJobSpringExecutor; + } +} diff --git a/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobProperties.java b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobProperties.java new file mode 100644 index 0000000..52ed1a1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/src/main/java/com/njzscloud/common/job/XxlJobProperties.java @@ -0,0 +1,15 @@ +package com.njzscloud.common.job; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties(prefix = "xxl-job") +public class XxlJobProperties { + private boolean enable = false; + private XxlAdminProperties admin = new XxlAdminProperties(); + + private XxlExecutorProperties executor = new XxlExecutorProperties(); +} diff --git a/njzscloud-common/njzscloud-common-job/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-job/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..d497d6e --- /dev/null +++ b/njzscloud-common/njzscloud-common-job/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.job.XxlJobAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-minio/pom.xml b/njzscloud-common/njzscloud-common-minio/pom.xml new file mode 100644 index 0000000..0929039 --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-minio + + + 8 + 8 + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + com.njzscloud + njzscloud-common-mvc + provided + + + io.minio + minio + 8.5.17 + + + com.aliyun.oss + aliyun-sdk-oss + 3.17.4 + + + + diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/AliOSSAutoConfiguration.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/AliOSSAutoConfiguration.java new file mode 100644 index 0000000..9738bdf --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/AliOSSAutoConfiguration.java @@ -0,0 +1,38 @@ +package com.njzscloud.common.minio.config; + +import com.aliyun.oss.ClientBuilderConfiguration; +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.common.auth.DefaultCredentialProvider; +import com.aliyun.oss.common.comm.SignVersion; +import com.njzscloud.common.minio.controller.OSSController; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(MinioProperties.class) +public class AliOSSAutoConfiguration { + @Bean(destroyMethod = "shutdown") + public OSS ossClient(MinioProperties minioProperties) { + String endpoint = minioProperties.getEndpoint(); + String accessKey = minioProperties.getAccessKey(); + String secretKey = minioProperties.getSecretKey(); + String region = minioProperties.getRegion(); + + ClientBuilderConfiguration clientBuilderConfiguration = new ClientBuilderConfiguration(); + clientBuilderConfiguration.setSignatureVersion(SignVersion.V4); + DefaultCredentialProvider credentialProvider = new DefaultCredentialProvider(accessKey, secretKey); + return OSSClientBuilder.create() + .endpoint(endpoint) + .region(region) + .credentialsProvider(credentialProvider) + .clientConfiguration(clientBuilderConfiguration) + .build(); + } + + @Bean + public OSSController ossController() { + return new OSSController(); + } +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioAutoConfiguration.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioAutoConfiguration.java new file mode 100644 index 0000000..407a241 --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioAutoConfiguration.java @@ -0,0 +1,28 @@ +package com.njzscloud.common.minio.config; + +import com.njzscloud.common.minio.controller.OSSController; +import io.minio.MinioAsyncClient; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(MinioProperties.class) +public class MinioAutoConfiguration { + + @Bean(destroyMethod = "close") + public MinioAsyncClient minioClient(MinioProperties minioProperties) { + String endpoint = minioProperties.getEndpoint(); + String accessKey = minioProperties.getAccessKey(); + String secretKey = minioProperties.getSecretKey(); + return MinioAsyncClient.builder() + .endpoint(endpoint) + .credentials(accessKey, secretKey) + .build(); + } + + @Bean + public OSSController ossController() { + return new OSSController(); + } +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioProperties.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioProperties.java new file mode 100644 index 0000000..3efd0cb --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/config/MinioProperties.java @@ -0,0 +1,16 @@ +package com.njzscloud.common.minio.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties("oss.minio") +public class MinioProperties { + private String endpoint; + private String region; + private String accessKey; + private String secretKey; + private String bucketName; +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/controller/OSSController.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/controller/OSSController.java new file mode 100644 index 0000000..8e54477 --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/controller/OSSController.java @@ -0,0 +1,53 @@ +package com.njzscloud.common.minio.controller; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.minio.util.AliOSS; +import com.njzscloud.common.minio.util.Minio; +import com.njzscloud.common.mvc.util.FileResponseUtil; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/oss") +public class OSSController { + + @GetMapping("/end_mlt_upload") + public R endMltUpload(String objectName, String uploadId, int partNum) { + Minio.endMltUpload(objectName, uploadId, partNum); + return R.success(); + } + + @GetMapping("/start_mlt_upload") + public R>> startMltUpload( + String objectName, + String contentType, + int partNum) { + return R.success(Minio.startMltUpload(objectName, contentType, partNum)); + } + + @GetMapping("/obtain_presigned_url") + public R> obtainPresignedUrl(@RequestParam(value = "filename") String filename) { + String objectName = IdUtil.fastSimpleUUID(); + if (StrUtil.isNotBlank(filename)) { + objectName = objectName + "." + FileUtil.extName(filename); + } + return R.success(AliOSS.obtainPresignedUrl(objectName)); + } + + @GetMapping("/download/{bucketName}/{objectName}") + public void obtainFile( + @PathVariable("bucketName") String bucketName, + @PathVariable("objectName") String objectName, + HttpServletResponse response) { + Tuple2 tuple2 = AliOSS.obtainFile(bucketName, objectName); + FileResponseUtil.download(response, tuple2.get_0(), tuple2.get_1(), objectName); + } +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/AliOSS.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/AliOSS.java new file mode 100644 index 0000000..a86673e --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/AliOSS.java @@ -0,0 +1,118 @@ +package com.njzscloud.common.minio.util; + + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.aliyun.oss.ClientException; +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSException; +import com.aliyun.oss.common.utils.BinaryUtil; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.OSSObject; +import com.aliyun.oss.model.ObjectMetadata; +import com.aliyun.oss.model.PolicyConditions; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.minio.config.MinioProperties; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class AliOSS { + private static final OSS CLIENT; + private static final String BUCKET_NAME; + private static final String ACCESS_KEY; + + static { + CLIENT = SpringUtil.getBean(OSS.class); + BUCKET_NAME = SpringUtil.getBean(MinioProperties.class).getBucketName(); + ACCESS_KEY = SpringUtil.getBean(MinioProperties.class).getAccessKey(); + if (StrUtil.isNotBlank(BUCKET_NAME)) { + createBucket(BUCKET_NAME); + } + } + + public static void createBucket(String bucketName) { + Assert.notBlank(bucketName, "未指明存储位置"); + try { + boolean exists = CLIENT.doesBucketExist(bucketName); + if (exists) return; + CLIENT.createBucket(bucketName); + } catch (Exception e) { + log.error("存储桶创建失败", e); + } + } + + public static Map obtainPresignedUrl(String objectName) { + Map data = new HashMap<>(); + try { + long expireEndTime = System.currentTimeMillis() + 3600 * 1000; + Date expiration = new Date(expireEndTime); + PolicyConditions policyConds = new PolicyConditions(); + policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000); + String postPolicy = CLIENT.generatePostPolicy(expiration, policyConds); + byte[] binaryData = postPolicy.getBytes(StandardCharsets.UTF_8); + String encodedPolicy = BinaryUtil.toBase64String(binaryData); + String postSignature = CLIENT.calculatePostSignature(postPolicy); + data.put("OSSAccessKeyId", ACCESS_KEY); + data.put("policy", encodedPolicy); + data.put("signature", postSignature); + data.put("success_action_status", "200"); + data.put("name", objectName); + data.put("key", objectName); + data.put("bucketName", BUCKET_NAME); + data.put("objectName", objectName); + } catch ( + OSSException oe) { + System.out.println("Caught an OSSException, which means your request made it to OSS, " + + "but was rejected with an error response for some reason."); + // 假设此方法存在 + System.out.println("HTTP Status Code: " + oe.getRawResponseError()); + System.out.println("Error Message: " + oe.getErrorMessage()); + System.out.println("Error Code: " + oe.getErrorCode()); + System.out.println("Request ID: " + oe.getRequestId()); + System.out.println("Host ID: " + oe.getHostId()); + } catch (ClientException ce) { + System.out.println("Caught an ClientException, which means the client encountered " + + "a serious internal problem while trying to communicate with OSS, " + + "such as not being able to access the network."); + System.out.println("Error Message: " + ce.getMessage()); + } + return data; + } + + public static Tuple2 obtainFile(String bucketName, String objectName) { + try { + // 下载Object到本地文件，并保存到指定的本地路径中。如果指定的本地文件存在会覆盖，不存在则新建。 + // 如果未指定本地路径，则下载后的文件默认保存到示例程序所属项目对应本地路径中。 + OSSObject response = CLIENT.getObject(new GetObjectRequest(bucketName, objectName)); + ObjectMetadata objectMetadata = response.getObjectMetadata(); + String contentType = objectMetadata.getContentType(); + InputStream objectContent = response.getObjectContent(); + return Tuple2.create(objectContent, contentType); + + } catch (OSSException oe) { + System.out.println("Caught an OSSException, which means your request made it to OSS, " + + "but was rejected with an error response for some reason."); + System.out.println("Error Message:" + oe.getErrorMessage()); + System.out.println("Error Code:" + oe.getErrorCode()); + System.out.println("Request ID:" + oe.getRequestId()); + System.out.println("Host ID:" + oe.getHostId()); + } catch (ClientException ce) { + System.out.println("Caught an ClientException, which means the client encountered " + + "a serious internal problem while trying to communicate with OSS, " + + "such as not being able to access the network."); + System.out.println("Error Message:" + ce.getMessage()); + } + return null; + } + +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java new file mode 100644 index 0000000..0582a82 --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/java/com/njzscloud/common/minio/util/Minio.java @@ -0,0 +1,164 @@ +package com.njzscloud.common.minio.util; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.google.common.collect.HashMultimap; +import com.njzscloud.common.core.ex.Exceptions; +import com.njzscloud.common.core.tuple.Tuple2; +import com.njzscloud.common.minio.config.MinioProperties; +import io.minio.*; +import io.minio.errors.*; +import io.minio.http.Method; +import io.minio.messages.ListPartsResult; +import io.minio.messages.Part; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.time.ZonedDateTime; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class Minio { + private static final MinioAsyncClient CLIENT; + private static final Map, String> ERROR_MAP = new HashMap<>(); + private static final String BUCKET_NAME; + + static { + ERROR_MAP.put(ErrorResponseException.class, "文件存储服务响应失败"); + ERROR_MAP.put(InsufficientDataException.class, "文件读取失败"); + ERROR_MAP.put(InternalException.class, "文件服务器错误"); + ERROR_MAP.put(InvalidKeyException.class, "缺少 HMAC SHA-256 依赖"); + ERROR_MAP.put(InvalidResponseException.class, "服务器未响应"); + ERROR_MAP.put(IOException.class, "文件读取失败"); + ERROR_MAP.put(NoSuchAlgorithmException.class, "缺少 MD5 或 SHA-256 依赖"); + ERROR_MAP.put(XmlParserException.class, "数据解析失败"); + CLIENT = SpringUtil.getBean(MinioAsyncClient.class); + BUCKET_NAME = SpringUtil.getBean(MinioProperties.class).getBucketName(); + if (StrUtil.isNotBlank(BUCKET_NAME)) { + createBucket(BUCKET_NAME); + } + } + + public static void createBucket(String bucketName) { + Assert.notBlank(bucketName, "未指明存储位置"); + try { + boolean exists = Minio.execSync(() -> CLIENT.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build())); + if (exists) return; + Minio.execSync(() -> CLIENT.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build())); + } catch (Exception e) { + log.error("存储桶创建失败", e); + } + } + + public static Tuple2> startMltUpload(String objectName, String contentType, int partNum) { + HashMultimap header = HashMultimap.create(); + header.put("Content-Type", contentType); + return Minio.execSync(() -> CLIENT + .createMultipartUploadAsync(BUCKET_NAME, null, objectName, header, null) + .thenApply(it -> { + String uploadId = it.result().uploadId(); + LinkedList urls = new LinkedList<>(); + for (int i = 0; i < partNum; i++) { + int partNumber = i + 1; + String url = obtainPresignedUrl(objectName + "." + partNumber, MapUtil.builder() + .put("partNumber", Integer.toString(partNumber)) + .put("uploadId", uploadId) + .build()); + urls.add(url); + } + return Tuple2.create(uploadId, urls); + })); + } + + public static void endMltUpload(String objectName, String uploadId, int partNum) { + CompletableFuture.runAsync(() -> { + for (int i = 0; i < partNum % 1000 + 1; i++) { + int partNumberMarker = i + 1; + execSync(() -> CLIENT.listPartsAsync(BUCKET_NAME, + null, + objectName, + null, + partNumberMarker, + uploadId, + null, null) + .thenAccept(it -> { + ListPartsResult result = it.result(); + List parts = result.partList(); + execSync(() -> CLIENT.completeMultipartUploadAsync(BUCKET_NAME, + null, + objectName, + uploadId, + parts.toArray(new Part[0]), + null, + null + )); + }) + ); + } + }); + } + + public static String obtainPresignedUrl(String objectName, Map extraQueryParams) { + return exec(() -> CLIENT.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder() + .method(Method.PUT) + .bucket(BUCKET_NAME) + .object(objectName) + .expiry(1, TimeUnit.DAYS) + .extraQueryParams(extraQueryParams) + .build())); + } + + public static Map obtainPresignedUrl(String bucketName, String objectName) { + return exec(() -> { + PostPolicy policy = new PostPolicy(bucketName, ZonedDateTime.now().plusDays(1)); + policy.addEqualsCondition("key", objectName); + Map data = CLIENT.getPresignedPostFormData(policy); + data.put("key", objectName); + data.put("bucketName", bucketName); + data.put("objectName", objectName); + return data; + }); + } + + public static Tuple2 obtainFile(String bucketName, String objectName) { + GetObjectResponse response = execSync(() -> CLIENT.getObject(GetObjectArgs.builder() + .object(objectName) + .bucket(bucketName).build())); + return Tuple2.create(response, response.headers().get("Content-Type")); + } + + private static T execSync(MinioExec> fn) { + try { + return fn.exec().get(); + } catch (Exception e) { + log.error("执行失败，文件服务器错误", e); + throw Exceptions.error(e, ERROR_MAP.getOrDefault(e.getClass(), "文件服务器错误")); + } + } + + private static T exec(MinioExec fn) { + try { + return fn.exec(); + } catch (Exception e) { + log.error("执行失败，文件服务器错误", e); + throw Exceptions.error(e, ERROR_MAP.getOrDefault(e.getClass(), "文件服务器错误")); + } + } + + public interface MinioExec { + T exec() throws Exception; + } +} diff --git a/njzscloud-common/njzscloud-common-minio/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-minio/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..e03f96e --- /dev/null +++ b/njzscloud-common/njzscloud-common-minio/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.minio.config.AliOSSAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-mp/pom.xml b/njzscloud-common/njzscloud-common-mp/pom.xml new file mode 100644 index 0000000..8e023c5 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-mp + + + 8 + 8 + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + com.njzscloud + njzscloud-common-security + provided + + + com.jcraft + jsch + 0.1.55 + + + + com.mysql + mysql-connector-j + + + + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + mybatis-plus-jsqlparser-4.9 + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-configuration-processor + + + diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DBTunnelAutoConfiguration.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DBTunnelAutoConfiguration.java new file mode 100644 index 0000000..bf11311 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DBTunnelAutoConfiguration.java @@ -0,0 +1,19 @@ +package com.njzscloud.common.mp.config; + +import com.njzscloud.common.mp.support.DBTunnel; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@ConditionalOnProperty(prefix = "mybatis-plus.tunnel", name = "enable", havingValue = "true") +@EnableConfigurationProperties({DbTunnelProperties.class}) +public class DBTunnelAutoConfiguration { + + @Bean(destroyMethod = "close") + public DBTunnel dbTunnel(DbTunnelProperties dbTunnelProperties) { + return new DBTunnel(dbTunnelProperties); + } + +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DbTunnelProperties.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DbTunnelProperties.java new file mode 100644 index 0000000..bb56785 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/DbTunnelProperties.java @@ -0,0 +1,34 @@ +package com.njzscloud.common.mp.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties("mybatis-plus.tunnel") +public class DbTunnelProperties { + private boolean enable = false; + + private SSHProperties ssh; + private DBProperties db; + + @Getter + @Setter + public static class SSHProperties { + private String host; + private int port = 22; + private String user; + private String credentials; + private String passphrase; + private int localPort; + } + + @Getter + @Setter + public static class DBProperties { + private String host; + private int port = 3306; + } + +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MpAutoConfiguration.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MpAutoConfiguration.java new file mode 100644 index 0000000..54f1cb1 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MpAutoConfiguration.java @@ -0,0 +1,42 @@ +package com.njzscloud.common.mp.config; + +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.njzscloud.common.mp.support.CustomDataPermissionHandler; +import com.njzscloud.common.mp.support.MetaObjectHandlerImpl; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Mybatis-Plus 配置 + */ +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties({MybatisPlusProperties.class}) +public class MpAutoConfiguration { + + /** + * 插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor(MybatisPlusProperties mybatisPlusProperties) { + MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); + // 分页 + mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor()); + // 乐观锁 + // mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + // 防止全表更新删除 + mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); + + // DataPermissionInterceptor dataPermissionInterceptor = new DataPermissionInterceptor(new CustomDataPermissionHandler(mybatisPlusProperties.getIgnoreTables())); + // mybatisPlusInterceptor.addInnerInterceptor(dataPermissionInterceptor); + return mybatisPlusInterceptor; + } + + @Bean + public MetaObjectHandlerImpl metaObjectHandlerImpl() { + return new MetaObjectHandlerImpl(); + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MybatisPlusProperties.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MybatisPlusProperties.java new file mode 100644 index 0000000..7ab76c2 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/config/MybatisPlusProperties.java @@ -0,0 +1,14 @@ +package com.njzscloud.common.mp.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.List; + +@Getter +@Setter +@ConfigurationProperties("mybatis-plus") +public class MybatisPlusProperties { + private List ignoreTables; +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/CustomDataPermissionHandler.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/CustomDataPermissionHandler.java new file mode 100644 index 0000000..339eb37 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/CustomDataPermissionHandler.java @@ -0,0 +1,43 @@ +package com.njzscloud.common.mp.support; + +import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler; +import com.njzscloud.common.security.support.UserDetail; +import com.njzscloud.common.security.util.SecurityUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; +import net.sf.jsqlparser.schema.Table; + +import java.util.List; +import java.util.function.Supplier; + +@Slf4j +@AllArgsConstructor +public class CustomDataPermissionHandler implements MultiDataPermissionHandler { + + private final List ignoreTables; + + public static final Supplier TENANT_ID_SUPPLIER = () -> { + UserDetail userDetail = SecurityUtil.loginUser(); + Long tenantId = 0L; + if (userDetail != null) tenantId = userDetail.getTenantId(); + if (tenantId == null) tenantId = 0L; + return tenantId; + }; + + @Override + public Expression getSqlSegment(Table table, Expression where, String mappedStatementId) { + Long tenantId = TENANT_ID_SUPPLIER.get(); + String tableName = table.getName(); + if ((ignoreTables != null && ignoreTables.contains(tableName)) || tenantId == null || tenantId == 0L) + return null; + try { + return CCJSqlParserUtil.parseCondExpression("tenant_id = " + tenantId); + } catch (JSQLParserException e) { + log.error("租户 Id 条件设置失败：{}", tenantId, e); + return null; + } + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/DBTunnel.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/DBTunnel.java new file mode 100644 index 0000000..7e4cf29 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/DBTunnel.java @@ -0,0 +1,114 @@ +package com.njzscloud.common.mp.support; + +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; +import com.njzscloud.common.mp.config.DbTunnelProperties; + +import java.io.File; + +import com.jcraft.jsch.*; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +@Slf4j +public class DBTunnel { + + private final DbTunnelProperties dbTunnelProperties; + private JSch jsch; + private Session session; + private ScheduledExecutorService heartbeatExecutor; + + public DBTunnel(DbTunnelProperties dbTunnelProperties) { + this.dbTunnelProperties = dbTunnelProperties; + if (dbTunnelProperties.isEnable()) { + log.info("数据库 SSH 隧道已启用"); + connect(); + startHeartbeat(); + } + } + + private synchronized void connect() { + try { + if (isConnected()) { + return; + } + + DbTunnelProperties.SSHProperties ssh = dbTunnelProperties.getSsh(); + String credentials = ssh.getCredentials(); + String passphrase = ssh.getPassphrase(); + String user = ssh.getUser(); + String host = ssh.getHost(); + int port = ssh.getPort(); + int localPort = ssh.getLocalPort(); + DbTunnelProperties.DBProperties db = dbTunnelProperties.getDb(); + String dbHost = db.getHost(); + int dbPort = db.getPort(); + + jsch = new JSch(); + // 使用私钥认证 + File keyFile = new File(credentials); + if (!keyFile.exists()) { + throw new RuntimeException("私钥文件不存在: " + credentials); + } + + if (passphrase != null) { + jsch.addIdentity(credentials, passphrase); + } else { + jsch.addIdentity(credentials); + } + + // 创建SSH会话 + session = jsch.getSession(user, host, port); + session.setConfig("StrictHostKeyChecking", "no"); // 禁用主机密钥检查 + + // 设置保持活动状态 + session.setServerAliveInterval(60000); // 每分钟发送一次保持活动的数据包 + session.setServerAliveCountMax(3); // 允许3次失败 + + session.connect(); + + // 设置端口转发 (本地端口 -> 远程数据库) + session.setPortForwardingL(localPort, dbHost, dbPort); + log.info("SSH 隧道已成功连接并转发端口 {} -> {}:{}", localPort, dbHost, dbPort); + } catch (JSchException e) { + log.error("SSH 隧道连接失败", e); + throw new RuntimeException("SSH 隧道连接失败", e); + } + } + + private void startHeartbeat() { + heartbeatExecutor = Executors.newSingleThreadScheduledExecutor(); + heartbeatExecutor.scheduleAtFixedRate(() -> { + try { + if (!isConnected()) { + log.warn("SSH 隧道连接已断开，尝试重新连接..."); + connect(); + } + } catch (Exception e) { + log.error("SSH 隧道心跳检测失败", e); + } + }, 30, 30, TimeUnit.SECONDS); // 每30秒检查一次连接状态 + } + + public boolean isConnected() { + return session != null && session.isConnected(); + } + + public void close() { + if (heartbeatExecutor != null) { + heartbeatExecutor.shutdownNow(); + } + + if (session != null && session.isConnected()) { + session.disconnect(); + log.info("SSH隧道已关闭"); + } + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/MetaObjectHandlerImpl.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/MetaObjectHandlerImpl.java new file mode 100644 index 0000000..e2fc4d9 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/MetaObjectHandlerImpl.java @@ -0,0 +1,51 @@ +package com.njzscloud.common.mp.support; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.njzscloud.common.security.support.UserDetail; +import com.njzscloud.common.security.util.SecurityUtil; +import org.apache.ibatis.reflection.MetaObject; + +import java.time.LocalDateTime; +import java.util.function.Supplier; + +/** + * 字段填充 + * 填充字段：createTime、creatorId、modifyTime、modifierId + */ +public class MetaObjectHandlerImpl implements MetaObjectHandler { + /** + * 获取当前登录人 Id，默认：0 + */ + public static final Supplier OPERATOR_ID_SUPPLIER = () -> { + UserDetail userDetail = SecurityUtil.loginUser(); + Long userId = 0L; + if (userDetail != null) userId = userDetail.getUserId(); + if (userId == null) userId = 0L; + return userId; + }; + public static final Supplier TENANT_ID_SUPPLIER = () -> { + UserDetail userDetail = SecurityUtil.loginUser(); + Long tenantId = 0L; + if (userDetail != null) tenantId = userDetail.getTenantId(); + if (tenantId == null) tenantId = 0L; + return tenantId; + }; + + public static final Supplier OPERATOR_TIME_SUPPLIER = LocalDateTime::now; + + @Override + public void insertFill(MetaObject metaObject) { + this.strictInsertFill(metaObject, "createTime", OPERATOR_TIME_SUPPLIER, LocalDateTime.class); + this.strictInsertFill(metaObject, "creatorId", OPERATOR_ID_SUPPLIER, Long.class); + + this.strictInsertFill(metaObject, "modifyTime", OPERATOR_TIME_SUPPLIER, LocalDateTime.class); + this.strictInsertFill(metaObject, "modifierId", OPERATOR_ID_SUPPLIER, Long.class); + this.strictInsertFill(metaObject, "tenantId", TENANT_ID_SUPPLIER, Long.class); + } + + @Override + public void updateFill(MetaObject metaObject) { + this.strictUpdateFill(metaObject, "modifyTime", OPERATOR_TIME_SUPPLIER, LocalDateTime.class); + this.strictUpdateFill(metaObject, "modifierId", OPERATOR_ID_SUPPLIER, Long.class); + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java new file mode 100644 index 0000000..7680965 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageParam.java @@ -0,0 +1,65 @@ +package com.njzscloud.common.mp.support; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.util.ArrayList; +import java.util.List; + +/** + * 分页参数 + */ +@Getter +@Setter +@Accessors(chain = true) +public final class PageParam { + /** + * 每页显示条数，默认 10 + */ + private Integer size; + + /** + * 当前页 + */ + private Integer current; + + /** + * 排序字段信息 + * 格式：a:desc,b:asc + */ + private String orders; + + public Page toPage() { + List orderItemList = new ArrayList<>(); + if (StrUtil.isNotBlank(orders)) { + String[] orderItems = orders.split(","); + for (String orderItem : orderItems) { + String[] item = orderItem.split(":"); + OrderItem orderItem_ = new OrderItem(); + if (item.length == 1) { + orderItem_.setColumn(item[0]); + orderItemList.add(orderItem_); + } else if (item.length == 2) { + orderItem_.setColumn(item[0]); + if ("asc".equalsIgnoreCase(item[1])) { + orderItem_.setAsc(true); + } else if ("desc".equalsIgnoreCase(item[1])) { + orderItem_.setAsc(false); + } else { + throw new RuntimeException(StrUtil.format("排序参数错误，字段：orders，接收到的值：{}", orders)); + } + orderItemList.add(orderItem_); + } else { + throw new RuntimeException(StrUtil.format("排序参数错误，字段：orders，接收到的值：{}", orders)); + } + } + } + Page page = new Page<>(current == null ? 1 : current, size == null ? 500 : size); + page.setOrders(orderItemList); + return page; + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java new file mode 100644 index 0000000..b0b950f --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/PageResult.java @@ -0,0 +1,46 @@ +package com.njzscloud.common.mp.support; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; + +import java.util.List; + +/** + * 分页结果类 + */ +@Getter +@Setter +@RequiredArgsConstructor(access = AccessLevel.PRIVATE) +public final class PageResult { + + private final List records; + + /** + * 总数 + */ + private final Integer total; + + /** + * 总页数 + */ + private final Integer pages; + + /** + * 每页显示条数，默认 10 + */ + private final Integer size; + + /** + * 当前页 + */ + private final Integer current; + + + public static PageResult of(IPage page) { + return new PageResult<>(page.getRecords(), (int) page.getTotal(), (int) page.getPages(), (int) page.getSize(), (int) page.getCurrent()); + } + +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/e/EnumTypeHandlerDealer.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/e/EnumTypeHandlerDealer.java new file mode 100644 index 0000000..85c7b83 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/e/EnumTypeHandlerDealer.java @@ -0,0 +1,123 @@ +package com.njzscloud.common.mp.support.handler.e; + +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.type.EnumTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * 枚举类型处理器
+ * 仅处理 Dict 类型的枚举, 其他枚举类型采用 Mybatis 默认处理器
+ * 使用配置项 mybatis-plus.configuration.default-enum-type-handler + * + * @see Dict + * @see DictInt + * @see DictStr + */ +@Slf4j +public class EnumTypeHandlerDealer> extends EnumTypeHandler { + + private final Object[] enums; + private final EnumType enumType; + + /** + * 构建枚举类型处理器 + * + * @param type 枚举类型 + * @see DictInt + * @see DictStr + */ + public EnumTypeHandlerDealer(Class type) { + super(type); + + enums = type.getEnumConstants(); + + if (DictInt.class.isAssignableFrom(type)) { + enumType = EnumType.DICT_INT; + } else if (DictStr.class.isAssignableFrom(type)) { + enumType = EnumType.DICT_STR; + } else { + enumType = EnumType.OTHER; + log.warn("枚举类型 [{}] 未实现 [{}] 或 [{}], 数据库操作将使用 Mybatis 默认处理器", type, DictInt.class.getName(), DictStr.class.getName()); + } + } + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcType jdbcType) throws SQLException { + switch (enumType) { + case OTHER: + super.setNonNullParameter(ps, i, parameter, jdbcType); + break; + case DICT_INT: + ps.setObject(i, ((DictInt) parameter).getVal()); + break; + case DICT_STR: + ps.setObject(i, ((DictStr) parameter).getVal()); + break; + } + } + + @Override + public E getNullableResult(ResultSet rs, String columnName) throws SQLException { + String strVal = rs.getString(columnName); + + if (strVal == null) { + return null; + } + + if (enumType == EnumType.OTHER) { + return super.getNullableResult(rs, columnName); + } + return getNullableResult(strVal); + } + + @Override + public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + String strVal = rs.getString(columnIndex); + if (strVal == null) { + return null; + } + + if (enumType == EnumType.OTHER) { + return super.getNullableResult(rs, columnIndex); + } + return getNullableResult(strVal); + } + + @Override + public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + String strVal = cs.getString(columnIndex); + + if (strVal == null) { + return null; + } + if (enumType == EnumType.OTHER) { + return super.getNullableResult(cs, columnIndex); + } + + return getNullableResult(strVal); + } + + @SuppressWarnings("unchecked") + private E getNullableResult(String strVal) { + if (enumType == EnumType.DICT_INT) { + int val = Integer.parseInt(strVal); + return (E) Dict.parse(val, (DictInt[]) enums); + } else { + return (E) Dict.parse(strVal, (DictStr[]) enums); + } + } + + private enum EnumType { + OTHER, + DICT_INT, + DICT_STR + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java new file mode 100644 index 0000000..77e9e57 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/java/com/njzscloud/common/mp/support/handler/j/JsonTypeHandler.java @@ -0,0 +1,48 @@ +package com.njzscloud.common.mp.support.handler.j; + +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import com.njzscloud.common.core.fastjson.Fastjson; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; +import org.apache.ibatis.type.TypeHandler; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * Json 类型处理器 + */ +@Slf4j +@MappedTypes({Object.class}) +@MappedJdbcTypes({JdbcType.VARCHAR}) +public class JsonTypeHandler implements TypeHandler { + + @Override + public void setParameter(PreparedStatement ps, int i, Object parameter, JdbcType jdbcType) throws SQLException { + if (parameter == null) ps.setNull(i, jdbcType.TYPE_CODE); + else ps.setString(i, Fastjson.toJsonStr(parameter)); + + } + + @Override + public Object getResult(ResultSet rs, String columnName) throws SQLException { + String result = rs.getString(columnName); + return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + } + + @Override + public Object getResult(ResultSet rs, int columnIndex) throws SQLException { + String result = rs.getString(columnIndex); + return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + } + + @Override + public Object getResult(CallableStatement cs, int columnIndex) throws SQLException { + String result = cs.getString(columnIndex); + return StrUtil.isBlank(result) ? null : Fastjson.toBean(result, Object.class); + } +} diff --git a/njzscloud-common/njzscloud-common-mp/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-mp/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..4240fc4 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mp/src/main/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration = \ + com.njzscloud.common.mp.config.MpAutoConfiguration,\ + com.njzscloud.common.mp.config.DBTunnelAutoConfiguration diff --git a/njzscloud-common/njzscloud-common-mvc/pom.xml b/njzscloud-common/njzscloud-common-mvc/pom.xml new file mode 100644 index 0000000..4f6163a --- /dev/null +++ b/njzscloud-common/njzscloud-common-mvc/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.njzscloud + njzscloud-common + 0.0.1 + + + njzscloud-common-mvc + + + 8 + 8 + UTF-8 + + + + + com.njzscloud + njzscloud-common-core + provided + + + com.njzscloud + njzscloud-common-security + provided + + + + jakarta.validation + jakarta.validation-api + + + + org.hibernate.validator + hibernate-validator + + + + + javax.servlet + javax.servlet-api + + + + + org.junit.jupiter + junit-jupiter-engine + test + + + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-websocket + + + + + org.springframework.boot + spring-boot-configuration-processor + + + diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/MvcAutoConfiguration.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/MvcAutoConfiguration.java new file mode 100644 index 0000000..07e359e --- /dev/null +++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/MvcAutoConfiguration.java @@ -0,0 +1,47 @@ +package com.njzscloud.common.mvc.config; + +import com.njzscloud.common.core.jackson.serializer.BigDecimalModule; +import com.njzscloud.common.core.jackson.serializer.LongModule; +import com.njzscloud.common.core.jackson.serializer.TimeModule; +import com.njzscloud.common.mvc.support.DictHandlerMethodArgumentResolver; +import com.njzscloud.common.mvc.support.GlobalExceptionController; +import com.njzscloud.common.mvc.support.ReusableRequestFilter; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Spring MVC 配置 + */ +@Configuration(proxyBeanMethods = false) +public class MvcAutoConfiguration { + /** + * Jackson 配置 + */ + @Bean + public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() { + return build -> build + .modules(new TimeModule(), new LongModule(), new BigDecimalModule()); + } + + @Bean + public DictHandlerMethodArgumentResolver dictHandlerMethodArgumentResolver() { + return new DictHandlerMethodArgumentResolver(); + } + + @Bean + public GlobalExceptionController globalExceptionController() { + return new GlobalExceptionController(); + } + + @Bean + public FilterRegistrationBean requestBodyCacheFilter() { + FilterRegistrationBean registration = new FilterRegistrationBean<>(); + registration.setFilter(new ReusableRequestFilter()); + registration.addUrlPatterns("/*"); + registration.setName("reusableRequestFilter"); + registration.setOrder(0); + return registration; + } +} diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/RequestMappingHandlerAdapterAutoConfiguration.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/RequestMappingHandlerAdapterAutoConfiguration.java new file mode 100644 index 0000000..a740461 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/config/RequestMappingHandlerAdapterAutoConfiguration.java @@ -0,0 +1,72 @@ +package com.njzscloud.common.mvc.config; + +import cn.hutool.core.collection.CollUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.HandlerMethodReturnValueHandler; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * 参数、返回值处理器配置 + */ +@Slf4j +@Configuration(proxyBeanMethods = false) +public class RequestMappingHandlerAdapterAutoConfiguration implements InitializingBean { + + private final RequestMappingHandlerAdapter requestMappingHandlerAdapter; + + /** + * 收集自定义的 Controller 方法参数处理器 + */ + private final ObjectProvider handlerMethodArgumentResolver; + + /** + * 收集自定义的 Controller 方法返回值处理器 + */ + private final ObjectProvider handlerMethodReturnValueHandler; + + public RequestMappingHandlerAdapterAutoConfiguration(@Autowired(required = false) RequestMappingHandlerAdapter requestMappingHandlerAdapter, + ObjectProvider handlerMethodArgumentResolver, + ObjectProvider handlerMethodReturnValueHandler) { + this.requestMappingHandlerAdapter = requestMappingHandlerAdapter; + this.handlerMethodArgumentResolver = handlerMethodArgumentResolver; + this.handlerMethodReturnValueHandler = handlerMethodReturnValueHandler; + } + + @Override + public void afterPropertiesSet() throws Exception { + + if (requestMappingHandlerAdapter == null) { + log.warn("RequestMappingHandlerAdapter 为空"); + return; + } + + List handlerMethodArgumentResolverList = handlerMethodArgumentResolver.orderedStream().collect(Collectors.toList()); + List handlerMethodReturnValueHandlerList = handlerMethodReturnValueHandler.orderedStream().collect(Collectors.toList()); + + // Controller 方法参数处理器 + if (CollUtil.isNotEmpty(handlerMethodArgumentResolverList)) { + List argumentResolvers = requestMappingHandlerAdapter.getArgumentResolvers(); + if (argumentResolvers != null) { + handlerMethodArgumentResolverList.addAll(argumentResolvers); + } + requestMappingHandlerAdapter.setArgumentResolvers(handlerMethodArgumentResolverList); + } + + // Controller 方法返回值处理器 + if (CollUtil.isNotEmpty(handlerMethodReturnValueHandlerList)) { + List returnValueHandlers = requestMappingHandlerAdapter.getReturnValueHandlers(); + if (returnValueHandlers != null) { + handlerMethodReturnValueHandlerList.addAll(returnValueHandlers); + } + requestMappingHandlerAdapter.setReturnValueHandlers(handlerMethodReturnValueHandlerList); + } + } +} diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/DictHandlerMethodArgumentResolver.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/DictHandlerMethodArgumentResolver.java new file mode 100644 index 0000000..16ac323 --- /dev/null +++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/DictHandlerMethodArgumentResolver.java @@ -0,0 +1,60 @@ +package com.njzscloud.common.mvc.support; + +import cn.hutool.core.util.StrUtil; +import com.njzscloud.common.core.ienum.Dict; +import com.njzscloud.common.core.ienum.DictInt; +import com.njzscloud.common.core.ienum.DictStr; +import org.springframework.core.MethodParameter; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +/** + * 字典枚举参数处理器 + */ +@SuppressWarnings({"ConstantConditions"}) +public class DictHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + + /** + * 支持 {@link DictInt} 和 {@link DictStr} 类型的返回值 + * + * @param parameter 返回值信息 + * @return 当参数类型为 DictInt 或 DictStr 时返回 true + */ + @Override + public boolean supportsParameter(MethodParameter parameter) { + return DictInt.class.isAssignableFrom(parameter.getParameterType()) || DictStr.class.isAssignableFrom(parameter.getParameterType()); + } + + /** + * 解析参数 + * + * @param parameter 参数信息 + * @param container 当前请求的模型视图容器 + * @param request 当前请求对象 + * @param factory 创建 {@link WebDataBinder} 的工厂对象 + * @return 返回 {@link DictInt} 或 {@link DictStr} 对象 + */ + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest request, WebDataBinderFactory factory) throws Exception { + String parameterName = parameter.getParameterName(); + String param = request.getParameter(parameterName); + + if (StrUtil.isBlank(param)) return null; + + Class type = parameter.getParameterType(); + + if (DictInt.class.isAssignableFrom(type)) { + Integer val = Integer.parseInt(param); + DictInt[] constants = (DictInt[]) type.getEnumConstants(); + return Dict.parse(val, constants); + } else if (DictStr.class.isAssignableFrom(type)) { + DictStr[] constants = (DictStr[]) type.getEnumConstants(); + return Dict.parse(param, constants); + } else { + return null; + } + } +} diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/GlobalExceptionController.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/GlobalExceptionController.java new file mode 100644 index 0000000..135804d --- /dev/null +++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/GlobalExceptionController.java @@ -0,0 +1,323 @@ +package com.njzscloud.common.mvc.support; + +import com.njzscloud.common.core.ex.CliException; +import com.njzscloud.common.core.ex.ExceptionMsg; +import com.njzscloud.common.core.ex.SysError; +import com.njzscloud.common.core.ex.SysException; +import com.njzscloud.common.core.utils.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.ConversionNotSupportedException; +import org.springframework.context.support.DefaultMessageSourceResolvable; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.http.converter.HttpMessageNotWritableException; +import org.springframework.validation.BindException; +import org.springframework.validation.ObjectError; +import org.springframework.web.HttpMediaTypeNotAcceptableException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.*; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.context.request.async.AsyncRequestTimeoutException; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import org.springframework.web.multipart.support.MissingServletRequestPartException; +import org.springframework.web.servlet.NoHandlerFoundException; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 异常处理器 + * + * @see org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver + */ +@Slf4j +@RestControllerAdvice +public class GlobalExceptionController { + + /** + * 请求方法不匹配 + */ + @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public R httpRequestMethodNotSupportedExceptionHandler(HttpRequestMethodNotSupportedException e) { + printRequest(); + String method = e.getMethod(); + String[] supportedMethods = e.getSupportedMethods(); + log.error("不支持的请求方法：【{}】仅支持：【{}】", method, supportedMethods, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "不支持的请求方法：【{}】仅支持：【{}】", method, supportedMethods); + } + + /** + * 内容类型不匹配 + */ + @ResponseStatus(HttpStatus.UNSUPPORTED_MEDIA_TYPE) + @ExceptionHandler(HttpMediaTypeNotSupportedException.class) + public R httpMediaTypeNotSupportedExceptionHandler(HttpMediaTypeNotSupportedException e) { + printRequest(); + MediaType contentType = e.getContentType(); + List supportedMediaTypes = e.getSupportedMediaTypes(); + log.error("不支持的内容类型：【{}】仅支持：【{}】", contentType, supportedMediaTypes, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "不支持的内容类型：【{}】仅支持：【{}】", contentType, supportedMediaTypes); + } + + /** + * 未发现多部分表单 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MissingServletRequestPartException.class) + public R missingServletRequestPartExceptionHandler(MissingServletRequestPartException e) { + printRequest(); + String requestPartName = e.getRequestPartName(); + log.error("未发现多部分表单, 字段：【{}】", requestPartName, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "未发现多部分表单, 字段：【{}】", requestPartName); + } + + /** + * 缺少必要参数, 使用 @RequestParam(required = true) 的方法出现的异常 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MissingServletRequestParameterException.class) + public R missingServletRequestParameterExceptionHandler(MissingServletRequestParameterException e) { + printRequest(); + String parameterName = e.getParameterName(); + log.error("缺少必要参数, 字段：【{}】必须有值", parameterName, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "缺少必要参数, 字段：【{}】必须有值", parameterName); + } + + /** + * 缺少必要参数, 使用 @RequestHeader(required = true) 的方法出现的异常 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MissingRequestHeaderException.class) + public R missingRequestHeaderExceptionHandler(MissingRequestHeaderException e) { + printRequest(); + String headerName = e.getHeaderName(); + log.error("缺少必要的请求头参数, 请求头：【{}】必须有值", headerName, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "缺少必要的请求头参数, 请求头：【{}】必须有值", headerName); + } + + /** + * 缺少必要的请求参数 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(ServletRequestBindingException.class) + public R servletRequestBindingExceptionHandler(ServletRequestBindingException e) { + printRequest(); + log.error("缺少必要的请求参数", e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "缺少必要参数,【{}】", e.getMessage()); + } + + /** + * 方法参数类型与给定的参数类型不匹配 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public R methodArgumentTypeMismatchExceptionHandler(MethodArgumentTypeMismatchException e) { + printRequest(); + String name = e.getName(); + Object value = e.getValue(); + Class requiredType = e.getRequiredType(); + String simpleName = null; + if (requiredType != null) { + simpleName = requiredType.getSimpleName(); + } + log.error("参数类型不匹配, 字段：【{}】需要的类型为：【{}】, 接收到的值为：【{}】", name, simpleName, value, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "参数类型不匹配, 字段：【{}】需要的类型为：【{}】, 接收到的值为：【{}】", name, simpleName, value); + } + + + /** + * 读取请求参数失败，可能为参数格式错误，POST 请求发送 JSON 数据, 数据类型不匹配、时间格式不正确等 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(HttpMessageNotReadableException.class) + public R httpMessageNotReadableExceptionHandler(HttpMessageNotReadableException e) { + printRequest(); + log.error("读取请求体参数失败, 可能是参数格式错误", e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, "读取请求体参数失败, 可能是参数格式错误.【{}】", e.getMessage()); + } + + /** + * 注解 @RequestBody 和 @Validated 标注的对象，校验失败 + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(MethodArgumentNotValidException.class) + public R methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) { + printRequest(); + List allErrors = e.getAllErrors(); + List msg = allErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.toList()); + log.error("参数校验失败：【{}】", msg, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, msg); + } + + /** + * GET 请求参数校验失败（格式、数据类型错误） + */ + @ResponseStatus(HttpStatus.BAD_REQUEST) + @ExceptionHandler(BindException.class) + public R bindExceptionHandler(BindException e) { + printRequest(); + List allErrors = e.getAllErrors(); + List msg = allErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage).collect(Collectors.toList()); + log.error("参数校验失败：【{}】", msg, e); + return R.failed(ExceptionMsg.CLI_ERR_MSG, msg); + } + + + /** + * 404 + *

需要配置：

+ * 
+     * spring:
+     *   web:
+     *     resources:
+     *       # 关闭静态资源映射
+     *       add-mappings: false
+     *   mvc:
+     *     # 为找到的资源抛出异常
+     *     throw-exception-if-no-handler-found: true
+     */
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public R noHandlerFoundExceptionHandler(NoHandlerFoundException e) {
+        printRequest();
+        String httpMethod = e.getHttpMethod();
+        String requestURL = e.getRequestURL();
+        log.error("资源不存在：[【{}】【{}】]", httpMethod, requestURL, e);
+        return R.failed(ExceptionMsg.CLI_ERR_MSG, "资源不存在，【{}】【{}】", httpMethod, requestURL);
+    }
+
+    /**
+     * 无法生成需要的响应结果
+     */
+    @ResponseStatus(HttpStatus.NOT_ACCEPTABLE)
+    @ExceptionHandler(HttpMediaTypeNotAcceptableException.class)
+    public R httpMediaTypeNotAcceptableExceptionHandler(HttpMediaTypeNotAcceptableException e) {
+        printRequest();
+        log.error("无法生成需要的响应结果", e);
+        return R.failed(ExceptionMsg.SYS_ERR_MSG, "无法生成需要的响应结果，{}", e.getMessage());
+    }
+
+    /**
+     * 路径参数名称不匹配
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MissingPathVariableException.class)
+    public R missingPathVariableExceptionHandler(MissingPathVariableException e) {
+        printRequest();
+        String variableName = e.getVariableName();
+        log.error("路径参数名称与 URL 模板不匹配, 需要的路径参数名称：【{}】, URL 模板中未找到此名称对应的参数", variableName, e);
+        return R.failed(ExceptionMsg.CLI_ERR_MSG, "路径参数名称与 URL 模板不匹配, 需要的路径参数名称：【{}】, URL 模板中未找到此名称对应的参数", variableName);
+    }
+
+    /**
+     * 没有合适的转换器
+     */
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(ConversionNotSupportedException.class)
+    public R conversionNotSupportedExceptionHandler(ConversionNotSupportedException e) {
+        printRequest();
+        log.error("没有合适的转换器", e);
+        return R.failed(ExceptionMsg.SYS_ERR_MSG, "没有合适的转换器,【{}】", e.getMessage());
+    }
+
+    /**
+     * 写出响应信息时出现错误
+     */
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(HttpMessageNotWritableException.class)
+    public R httpMessageNotWritableExceptionHandler(HttpMessageNotWritableException e) {
+        printRequest();
+        log.error("写出响应信息时出现错误", e);
+        return R.failed(ExceptionMsg.SYS_ERR_MSG, "响应时出现错误,【{}】", e.getMessage());
+    }
+
+    /**
+     * 异步请求超时
+     */
+    @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
+    @ExceptionHandler(AsyncRequestTimeoutException.class)
+    public R asyncRequestTimeoutExceptionHandler(AsyncRequestTimeoutException e) {
+        printRequest();
+        log.error("下游服务响应超时", e);
+        return R.failed(ExceptionMsg.SYS_ERR_MSG, "服务器错误, 下游服务响应超时。{}", e.getMessage());
+    }
+
+    /**
+     * 参数错误
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(IllegalArgumentException.class)
+    public R cliExceptionHandler(IllegalArgumentException e) {
+        printRequest();
+        log.error("客户端参数错误", e);
+        return R.failed(ExceptionMsg.CLI_ERR_MSG, e.getMessage());
+    }
+
+    /**
+     * 客户端错误
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(CliException.class)
+    public R cliExceptionHandler(CliException e) {
+        printRequest();
+        log.error(e.getMessage(), e);
+        return R.failed(ExceptionMsg.CLI_ERR_MSG, e.message);
+    }
+
+    /**
+     * 系统异常
+     */
+    @ResponseStatus(HttpStatus.OK)
+    @ExceptionHandler(SysException.class)
+    public R sysExceptionHandler(SysException e) {
+        printRequest();
+        log.error(e.getMessage(), e);
+        return R.failed(e.expect, e.msg, e.message);
+    }
+
+    /**
+     * 系统错误
+     */
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(SysError.class)
+    public R sysErrorHandler(SysError e) {
+        printRequest();
+        log.error(e.getMessage(), e);
+        return R.failed(e.expect, e.msg, e.message);
+    }
+
+    /**
+     * 服务器错误
+     */
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(Throwable.class)
+    public R exceptionHandler(Throwable e) {
+        printRequest();
+        log.error("内部服务错误", e);
+        return R.failed(ExceptionMsg.SYS_ERR_MSG, "内部服务错误");
+    }
+
+    /**
+     * 打印日志
+     */
+    private void printRequest() {
+        try {
+            RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes();
+            HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
+            String method = request.getMethod();
+            String requestURI = request.getRequestURI();
+            log.error("接口请求异常：【{}】【{}】", method, requestURI);
+        } catch (Throwable e) {
+            log.error("接口请求信息打印失败", e);
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java
new file mode 100644
index 0000000..6de1a10
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableHttpServletRequest.java
@@ -0,0 +1,146 @@
+package com.njzscloud.common.mvc.support;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.core.jackson.Jackson;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
+import org.jetbrains.annotations.NotNull;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class ReusableHttpServletRequest extends HttpServletRequestWrapper {
+    private final byte[] body;
+
+    public ReusableHttpServletRequest(HttpServletRequest request) {
+        super(request);
+        try {
+            if (ServletFileUpload.isMultipartContent(request)) {
+                body = "多部分表单".getBytes(StandardCharsets.UTF_8);
+            } else {
+                ServletInputStream inputStream = request.getInputStream();
+                body = IoUtil.readBytes(inputStream);
+            }
+            printRequest();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void printRequest() {
+        try {
+            String method = this.getMethod();
+            String requestURI = this.getRequestURI();
+            Map parameterMap = this.getParameterMap();
+            Enumeration headerNames = this.getHeaderNames();
+            Map headerMap = new HashMap<>();
+            while (headerNames.hasMoreElements()) {
+                String headerName = headerNames.nextElement();
+                String header = this.getHeader(headerName);
+                headerMap.put(headerName, header);
+            }
+            String body;
+            if (method.equalsIgnoreCase("GET")) {
+                body = "无";
+            } else {
+                if (this.body == null || this.body.length == 0) {
+                    body = "无";
+                } else {
+                    body = new String(this.body, StandardCharsets.UTF_8);
+                    body = StrUtil.isBlank(body) ? "无" : body;
+                }
+            }
+            log.info("接口：【{}】【{}】\n请求头：【{}】\n请求参数：【{}】\n请求体：【{}】",
+                    method, requestURI, headerMap.isEmpty() ? "无" : Jackson.toJsonStr(headerMap), parameterMap.isEmpty() ? "无" : Jackson.toJsonStr(parameterMap), body);
+        } catch (Throwable e) {
+            log.error("接口请求信息打印失败", e);
+        }
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+            @Override
+            public int read() throws IOException {
+                return bais.read();
+            }
+
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+            }
+
+            @Override
+            public int readLine(byte[] b, int off, int len) throws IOException {
+                return super.readLine(b, off, len);
+            }
+
+            @Override
+            public int read(@NotNull byte[] b) throws IOException {
+                return bais.read(b);
+            }
+
+            @Override
+            public int read(@NotNull byte[] b, int off, int len) throws IOException {
+                return bais.read(b, off, len);
+            }
+
+            @Override
+            public long skip(long n) throws IOException {
+                return bais.skip(n);
+            }
+
+            @Override
+            public int available() throws IOException {
+                return bais.available();
+            }
+
+            @Override
+            public void close() throws IOException {
+                bais.close();
+            }
+
+            @Override
+            public synchronized void mark(int readlimit) {
+                bais.mark(readlimit);
+            }
+
+            @Override
+            public synchronized void reset() throws IOException {
+                bais.reset();
+            }
+
+            @Override
+            public boolean markSupported() {
+                return bais.markSupported();
+            }
+        };
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableRequestFilter.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableRequestFilter.java
new file mode 100644
index 0000000..4c928fe
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/support/ReusableRequestFilter.java
@@ -0,0 +1,17 @@
+package com.njzscloud.common.mvc.support;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+@Slf4j
+public class ReusableRequestFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        chain.doFilter(new ReusableHttpServletRequest((HttpServletRequest) request), response);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/util/FileResponseUtil.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/util/FileResponseUtil.java
new file mode 100644
index 0000000..4c99b94
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/util/FileResponseUtil.java
@@ -0,0 +1,97 @@
+package com.njzscloud.common.mvc.util;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+
+/**
+ * 响应文件工具
+ * （操作完成后输入输出流会被关闭）
+ */
+@Slf4j
+public class FileResponseUtil {
+    /**
+     * 预览文件
+     *
+     * @param response    HttpServletResponse
+     * @param inputStream 文件流
+     * @param contentType MIME
+     * @param fileName    文件名
+     */
+    public static void preview(HttpServletResponse response, InputStream inputStream, String contentType, String fileName) {
+        FileResponseUtil.writeFile(response, inputStream, contentType, "inline" + (StrUtil.isNotBlank(fileName) ? ";filename=" + URLUtil.encode(fileName) : ""));
+    }
+
+    /**
+     * 预览文件
+     *
+     * @param response    HttpServletResponse
+     * @param bytes       文件数据
+     * @param contentType MIME
+     * @param fileName    文件名
+     */
+    public static void preview(HttpServletResponse response, byte[] bytes, String contentType, String fileName) {
+        FileResponseUtil.writeFile(response, bytes, contentType, "inline" + (StrUtil.isNotBlank(fileName) ? ";filename=" + URLUtil.encode(fileName) : ""));
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param response    HttpServletResponse
+     * @param inputStream 文件流
+     * @param contentType MIME
+     * @param fileName    文件名
+     */
+    public static void download(HttpServletResponse response, InputStream inputStream, String contentType, String fileName) {
+        FileResponseUtil.writeFile(response, inputStream, contentType, "attachment" + (StrUtil.isNotBlank(fileName) ? ";filename=" + URLUtil.encode(fileName) : ""));
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param response    HttpServletResponse
+     * @param bytes       文件数据
+     * @param contentType MIME
+     * @param fileName    文件名
+     */
+    public static void download(HttpServletResponse response, byte[] bytes, String contentType, String fileName) {
+        FileResponseUtil.writeFile(response, bytes, contentType, "attachment" + (StrUtil.isNotBlank(fileName) ? ";filename=" + URLUtil.encode(fileName) : ""));
+    }
+
+    /**
+     * 向客户端响应文件
+     *
+     * @param response           HttpServletResponse
+     * @param data               文件内容, 只能是 InputStream 或 byte[]
+     * @param contentType        MIME
+     * @param contentDisposition 请求头 Content-Disposition
+     */
+    public static void writeFile(HttpServletResponse response, Object data, String contentType, String contentDisposition) {
+        ServletOutputStream outputStream = null;
+        try {
+            response.setContentType(contentType);
+            response.setCharacterEncoding(CharsetUtil.UTF_8);
+            response.setHeader("Content-Disposition", contentDisposition);
+            outputStream = response.getOutputStream();
+            if (data instanceof InputStream) {
+                IoUtil.copy((InputStream) data, outputStream);
+            } else if (data instanceof byte[]) {
+                IoUtil.write(outputStream, false, (byte[]) data);
+            }
+        } catch (Exception e) {
+            throw Exceptions.error(e, "文件响应失败");
+        } finally {
+            IoUtil.close(outputStream);
+            if (data instanceof InputStream) {
+                IoUtil.close((InputStream) data);
+            }
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constrained.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constrained.java
new file mode 100644
index 0000000..1574587
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constrained.java
@@ -0,0 +1,5 @@
+package com.njzscloud.common.mvc.validator;
+
+public interface Constrained {
+    ValidRule[] rules();
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constraint.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constraint.java
new file mode 100644
index 0000000..b87ebbc
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/Constraint.java
@@ -0,0 +1,17 @@
+package com.njzscloud.common.mvc.validator;
+
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@javax.validation.Constraint(validatedBy = ConstraintValidator.class)
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.PARAMETER})
+public @interface Constraint {
+    String message() default "";
+
+    Class[] groups() default {};
+
+    Class[] payload() default {};
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ConstraintValidator.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ConstraintValidator.java
new file mode 100644
index 0000000..32697be
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ConstraintValidator.java
@@ -0,0 +1,31 @@
+package com.njzscloud.common.mvc.validator;
+
+import cn.hutool.core.util.StrUtil;
+
+import javax.validation.ConstraintValidatorContext;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ConstraintValidator implements javax.validation.ConstraintValidator {
+
+    @Override
+    public boolean isValid(Constrained valid, ConstraintValidatorContext ctx) {
+        ValidRule[] rules = valid.rules();
+
+        if (rules == null || rules.length == 0) return true;
+
+        List messageList = Arrays.stream(rules)
+                .filter(it -> !it.predicate.get())
+                .map(it -> it.message)
+                .collect(Collectors.toList());
+
+        if (messageList.isEmpty()) return true;
+
+        ctx.disableDefaultConstraintViolation();
+        ctx.buildConstraintViolationWithTemplate(StrUtil.join(";\n", messageList))
+                .addConstraintViolation();
+
+        return false;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ValidRule.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ValidRule.java
new file mode 100644
index 0000000..5fe392e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/validator/ValidRule.java
@@ -0,0 +1,22 @@
+package com.njzscloud.common.mvc.validator;
+
+
+import java.util.function.Supplier;
+
+/**
+ * 校验规则
+ */
+public class ValidRule {
+    public final Supplier predicate;
+    public final String message;
+
+    private ValidRule(Supplier predicate, String message) {
+        this.predicate = predicate;
+        this.message = message;
+    }
+
+    public static ValidRule of(Supplier predicate, String message) {
+        return new ValidRule(predicate, message);
+    }
+}
+
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketAutoConfiguration.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketAutoConfiguration.java
new file mode 100644
index 0000000..8ebebb6
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketAutoConfiguration.java
@@ -0,0 +1,75 @@
+package com.njzscloud.common.mvc.ws.config;
+
+import com.njzscloud.common.mvc.ws.support.TokenHandshakeInterceptor;
+import com.njzscloud.common.mvc.ws.support.WebSocketChannelInterceptor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+/**
+ * Websocket 配置，使用 STOMP 协议
+ */
+@Configuration(proxyBeanMethods = false)
+@RequiredArgsConstructor
+@EnableWebSocketMessageBroker
+@EnableConfigurationProperties(WebsocketProperties.class)
+@ConditionalOnProperty(value = "websocket.enable", havingValue = "true")
+public class WebsocketAutoConfiguration implements WebSocketMessageBrokerConfigurer, DisposableBean {
+
+    private final WebsocketProperties websocketProperties;
+    private final WebSocketChannelInterceptor webSocketChannelInterceptor = new WebSocketChannelInterceptor();
+    private final TokenHandshakeInterceptor tokenHandshakeInterceptor = new TokenHandshakeInterceptor();
+
+    /**
+     * 用于心跳消息的线程池
+     */
+    private final ThreadPoolTaskScheduler tts = new ThreadPoolTaskScheduler();
+
+    {
+
+        tts.setPoolSize(1);
+        tts.setThreadNamePrefix("ws-heartbeat-thread-");
+        tts.initialize();
+    }
+
+    /**
+     * 设置 Websocket
+     */
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint(websocketProperties.getEndpoint())
+                .addInterceptors(tokenHandshakeInterceptor);
+    }
+
+    /**
+     * 配置 STOMP 消息服务器
+     */
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+        WebsocketProperties.StompProperties stomp = websocketProperties.getStomp();
+        config.setApplicationDestinationPrefixes(stomp.getApplicationPrefixes())
+                .enableSimpleBroker(stomp.getBroadcastPrefixes())
+                .setTaskScheduler(tts);
+    }
+
+    /**
+     * 消息拦截器
+     */
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+        registration.interceptors(webSocketChannelInterceptor);
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        tts.shutdown();
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketProperties.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketProperties.java
new file mode 100644
index 0000000..467921f
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/config/WebsocketProperties.java
@@ -0,0 +1,43 @@
+package com.njzscloud.common.mvc.ws.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Websocket 配置项
+ */
+@Getter
+@Setter
+@ConfigurationProperties("websocket")
+public class WebsocketProperties {
+    /**
+     * 是否启用 Websocket
+     */
+    private boolean enable;
+
+    /**
+     * Websocket 连接地址，默认：/ws
+     */
+    private String endpoint = "/ws";
+
+    /**
+     * STOMP 协议配置
+     */
+    private StompProperties stomp = new StompProperties();
+
+    @Getter
+    @Setter
+    public static class StompProperties {
+        /**
+         * 客户端发送消息的地址前缀
+         */
+        private String[] applicationPrefixes = new String[]{"/app"};
+
+        /**
+         * 广播地址前缀
+         */
+        private String[] broadcastPrefixes = new String[]{"/topic"};
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/TokenHandshakeInterceptor.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/TokenHandshakeInterceptor.java
new file mode 100644
index 0000000..9252af8
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/TokenHandshakeInterceptor.java
@@ -0,0 +1,43 @@
+package com.njzscloud.common.mvc.ws.support;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.http.server.ServletServerHttpResponse;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * websocket Token 拦截器

+ * Sec-WebSocket-Protocol: [TOKEN]

+ * TOKEN 已在 Security 中校验过，此处不校验，仅配合 Websocket 完成子协议回写
+ */
+@Slf4j
+public class TokenHandshakeInterceptor implements HandshakeInterceptor {
+    private static final String SEC_WEB_SOCKET_PROTOCOL = "Sec-WebSocket-Protocol";
+
+    @Override
+    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse serverHttpResponse, WebSocketHandler wsHandler, Map attributes) {
+        return true;
+    }
+
+    @Override
+    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
+        try {
+            HttpServletRequest httpRequest = ((ServletServerHttpRequest) request).getServletRequest();
+            HttpServletResponse httpResponse = ((ServletServerHttpResponse) response).getServletResponse();
+            String token = httpRequest.getHeader(SEC_WEB_SOCKET_PROTOCOL);
+            if (StrUtil.isNotEmpty(token)) {
+                httpResponse.addHeader(SEC_WEB_SOCKET_PROTOCOL, token);
+            }
+        } catch (ClassCastException e) {
+            log.error("[Websocket 拦截器] 类型转换失败: {}、{}", request.getClass(), response.getClass(), e);
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/WebSocketChannelInterceptor.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/WebSocketChannelInterceptor.java
new file mode 100644
index 0000000..c839f04
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/support/WebSocketChannelInterceptor.java
@@ -0,0 +1,47 @@
+package com.njzscloud.common.mvc.ws.support;
+
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.security.support.Token;
+import com.njzscloud.common.security.support.UserDetail;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
+import org.springframework.messaging.simp.SimpMessageType;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+
+import java.security.Principal;
+
+/**
+ * 消息拦截器
+ */
+@Slf4j
+public class WebSocketChannelInterceptor implements ChannelInterceptor {
+
+    /**
+     * 消息发送之前
+     */
+    @Override
+    public Message preSend(Message message, MessageChannel messageChannel) {
+        StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+
+        // 心跳消息
+        Object header = accessor.getHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER);
+        if (SimpMessageType.HEARTBEAT.name().equals(header)) return message;
+
+        Principal user = accessor.getUser();
+
+        Assert.notNull(user, () -> Exceptions.exception("未登录，不能发送消息"));
+
+        UserDetail userDetail = (UserDetail) user;
+        Token token = userDetail.getToken();
+
+        Assert.isFalse(token.isExpired(), () -> Exceptions.exception("登录已过期，不能发送消息"));
+
+        return message;
+    }
+}
+
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/util/WsUtil.java b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/util/WsUtil.java
new file mode 100644
index 0000000..fdb8bf5
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/java/com/njzscloud/common/mvc/ws/util/WsUtil.java
@@ -0,0 +1,33 @@
+package com.njzscloud.common.mvc.ws.util;
+
+import cn.hutool.extra.spring.SpringUtil;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+
+public class WsUtil {
+    private static final SimpMessagingTemplate SIMP_MESSAGING_TEMPLATE;
+
+    static {
+        SIMP_MESSAGING_TEMPLATE = SpringUtil.getBean(SimpMessagingTemplate.class);
+    }
+
+    /**
+     * 对单发送信息
+     *
+     * @param userId      用户 Id
+     * @param destination 事件
+     * @param message     消息内容
+     */
+    public static void send(long userId, String destination, Object message) {
+        SIMP_MESSAGING_TEMPLATE.convertAndSendToUser(userId + "", destination, message);
+    }
+
+    /**
+     * 对群发送信息
+     *
+     * @param destination 事件
+     * @param message     消息内容
+     */
+    public static void send(String destination, Object message) {
+        SIMP_MESSAGING_TEMPLATE.convertAndSend(destination, message);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-mvc/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-mvc/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..d30ceb2
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-mvc/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
+  com.njzscloud.common.mvc.ws.config.WebsocketAutoConfiguration,\
+  com.njzscloud.common.mvc.config.MvcAutoConfiguration,\
+  com.njzscloud.common.mvc.config.RequestMappingHandlerAdapterAutoConfiguration
diff --git a/njzscloud-common/njzscloud-common-redis/pom.xml b/njzscloud-common/njzscloud-common-redis/pom.xml
new file mode 100644
index 0000000..2077b16
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/pom.xml
@@ -0,0 +1,58 @@
+
+
+    4.0.0
+    
+        com.njzscloud
+        njzscloud-common
+        0.0.1
+    
+
+    njzscloud-common-redis
+
+    
+        8
+        8
+        UTF-8
+    
+
+    
+        
+            com.njzscloud
+            njzscloud-common-core
+            provided
+        
+
+        
+        
+            io.lettuce
+            lettuce-core
+        
+
+        
+        
+            org.apache.commons
+            commons-pool2
+        
+
+        
+        
+            org.junit.jupiter
+            junit-jupiter-engine
+            test
+        
+
+        
+        
+            org.springframework.boot
+            spring-boot-starter
+        
+
+        
+        
+            org.springframework.boot
+            spring-boot-configuration-processor
+        
+    
+
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/RedisCli.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/RedisCli.java
new file mode 100644
index 0000000..bfb5fe0
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/RedisCli.java
@@ -0,0 +1,232 @@
+package com.njzscloud.common.redis;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.core.fastjson.Fastjson;
+import com.njzscloud.common.redis.support.RedisFastjsonCodec;
+import com.njzscloud.common.redis.support.RedisMessageDispatch;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.TransactionResult;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.support.ConnectionPoolSupport;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Redis 客户端，对 lettuce 客户端的封装
+ */
+@Slf4j
+@SuppressWarnings("unchecked")
+public class RedisCli {
+
+    private final RedisCodec codec = new RedisFastjsonCodec();
+
+    /**
+     * lettuce 客户端
+     */
+    @Getter
+    private final RedisClient redisClient;
+
+    /**
+     * 普通连接池
+     */
+    private final GenericObjectPool> pool;
+
+    /**
+     * 发布订阅模式连接池
+     */
+    private final GenericObjectPool> pubSubPool;
+
+    /**
+     * 已订阅的频道模式
+     */
+    private final Set subscribedPatterns = new HashSet<>();
+    /**
+     * 已订阅的频道
+     */
+    private final Set subscribedChannels = new HashSet<>();
+
+    /**
+     * 创建 Redis 客户端
+     *
+     * @param uri        Redis 连接 URI
+     * @param poolConfig 连接池配置
+     * @param pubsub     是否开启发布订阅模式支持
+     */
+    public RedisCli(RedisURI uri, GenericObjectPoolConfig poolConfig, boolean pubsub) {
+        redisClient = RedisClient.create(uri);
+
+        pool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connect(codec), (GenericObjectPoolConfig>) poolConfig);
+        if (pubsub) pubSubPool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connectPubSub(codec), (GenericObjectPoolConfig>) poolConfig);
+        else pubSubPool = null;
+    }
+
+    /**
+     * 退出
+     */
+    public void exit() {
+        if (pubSubPool != null) {
+            punsubscribe(subscribedPatterns);
+            unsubscribe(subscribedChannels);
+            pubSubPool.close();
+        }
+        pool.close();
+        redisClient.shutdown();
+    }
+
+    /**
+     * 执行 Redis 命令
+     *
+     * @param fn  要执行的操作
+     * @param  Redis 值类型
+     * @param  返回值类型
+     * @return 返回 fn 的返回值
+     */
+    public  R exec(Function, R> fn) {
+        try (StatefulRedisConnection connection = pool.borrowObject()) {
+            return fn.apply((RedisCommands) connection.sync());
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 操作执行失败");
+        }
+    }
+
+    /**
+     * 执行 Redis 命令（带事务）
+     *
+     * @param fn  要执行的操作
+     * @param  Redis 值类型
+     * @return {@link TransactionResult} 事务结果
+     */
+    public  TransactionResult execWithTransaction(Consumer> fn) {
+        try (StatefulRedisConnection connection = pool.borrowObject()) {
+            RedisCommands commands = (RedisCommands) connection.sync();
+            commands.multi();
+            fn.accept(commands);
+            return commands.exec();
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 操作执行失败");
+        }
+    }
+
+    /**
+     * 添加监听器
+     *
+     * @see RedisMessageDispatch
+     */
+    public void addListener(RedisPubSubListener redisPubSubListener) {
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            connection.addListener(redisPubSubListener);
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 监听器注册失败");
+        }
+    }
+
+    /**
+     * 发布消息
+     *
+     * @param channel 频道
+     * @param message 消息内容
+     */
+    public void publish(String channel, Object message) {
+        if (log.isDebugEnabled()) {
+            log.debug("发布消息，频道：【{}】，消息：【{}】", channel, Fastjson.toJsonStr(message));
+        }
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            connection.sync().publish(channel, message);
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 消息发布失败，频道：【{}】，消息：【{}】", channel, Fastjson.toJsonStr(message));
+        }
+    }
+
+    /**
+     * 订阅
+     *
+     * @param channels 频道
+     */
+    public void subscribe(Collection channels) {
+        if (log.isDebugEnabled()) {
+            log.debug("订阅，频道：【{}】", channels);
+        }
+        Collection newChannels = CollUtil.subtract(CollUtil.distinct(channels), subscribedChannels);
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            if (newChannels.isEmpty()) return;
+            connection.sync().subscribe(ArrayUtil.toArray(newChannels, String.class));
+            subscribedChannels.addAll(newChannels);
+            if (log.isDebugEnabled()) {
+                log.debug("当前已订阅的频道：【{}】", subscribedChannels);
+            }
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 订阅失败，频道：【{}】", channels);
+        }
+    }
+
+    /**
+     * 取消订阅
+     *
+     * @param channels 频道
+     */
+    public void unsubscribe(Collection channels) {
+        if (log.isDebugEnabled()) {
+            log.debug("订阅，频道：【{}】", channels);
+        }
+        if (channels == null || channels.isEmpty()) return;
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            connection.sync().unsubscribe(ArrayUtil.toArray(channels, String.class));
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 取消订阅失败，频道：【{}】", channels);
+        }
+    }
+
+    /**
+     * 订阅（使用匹配模式）
+     *
+     * @param patterns 频道匹配模式（支持 glob 匹配规则）
+     */
+    public void psubscribe(Collection patterns) {
+        if (log.isDebugEnabled()) {
+            log.debug("订阅（使用匹配模式），频道：【{}】", patterns);
+        }
+        Collection newChannels = CollUtil.subtract(CollUtil.distinct(patterns), subscribedPatterns);
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            if (newChannels.isEmpty()) return;
+            connection.sync().psubscribe(ArrayUtil.toArray(newChannels, String.class));
+            subscribedPatterns.addAll(newChannels);
+            if (log.isDebugEnabled()) {
+                log.debug("当前已订阅的频道（使用匹配模式）：【{}】", subscribedPatterns);
+            }
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 订阅失败（使用匹配模式），频道：【{}】", patterns);
+        }
+    }
+
+    /**
+     * 取消订阅（使用匹配模式）
+     *
+     * @param patterns 频道匹配模式（支持 glob 匹配规则）
+     */
+    public void punsubscribe(Collection patterns) {
+        if (log.isDebugEnabled()) {
+            log.debug("取消订阅（使用匹配模式），频道：【{}】", patterns);
+        }
+        if (patterns == null || patterns.isEmpty()) return;
+        try (StatefulRedisPubSubConnection connection = pubSubPool.borrowObject()) {
+            connection.sync().punsubscribe(ArrayUtil.toArray(patterns, String.class));
+        } catch (Exception e) {
+            throw Exceptions.error(e, "Redis 取消订阅失败，（使用匹配模式），频道：【{}】", patterns);
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/Eg.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/Eg.java
new file mode 100644
index 0000000..b494b10
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/Eg.java
@@ -0,0 +1,38 @@
+package com.njzscloud.common.redis.annotation;
+
+/**
+ * Redis 监听器使用示例，
+ * 在类上使用 @RedisListener 在方法上使用 @RedisChannel
+ */
+// @RedisListener
+public class Eg {
+    /**
+     * 无参
+     * 注解 @RedisChannel 的参数二选一
+     */
+    @RedisChannel(patterns = {"a*"}, channels = {"aa"})
+    public void a1() {
+    }
+
+    /**
+     * 一个参数
+     * 注解 @RedisChannel 的参数二选一
+     *
+     * @param message 消息内容（类型不限）
+     */
+    @RedisChannel(patterns = {"a*"}, channels = {"aa"})
+    public void a2(Object message) {
+    }
+
+    /**
+     * 三个参数
+     * 注解 @RedisChannel 的参数二选一
+     *
+     * @param pattern 频道匹配模式
+     * @param channel 频道名称
+     * @param message 消息内容 （类型不限）
+     */
+    @RedisChannel(patterns = {"a*"}, channels = {"aa"})
+    public void a3(String pattern, String channel, Object message) {
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisChannel.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisChannel.java
new file mode 100644
index 0000000..0040de9
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisChannel.java
@@ -0,0 +1,33 @@
+package com.njzscloud.common.redis.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Redis 订阅通道
+ * 
使用方式 {Eg}

+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RedisChannel {
+    /**
+     * 匹配模式
+     * 支持的 glob 样式模式：
+     * h?llo订阅 和hellohallohxllo
+     * h*llo订阅和hlloheeeello
+     * h[ae]llo订阅 和 但不订阅hellohallo,hillo
+     *
+     * @return String[] 匹配模式
+     */
+    String[] patterns() default {};
+
+    /**
+     * 频道名称
+     *
+     * @return String[] 频道名称
+     */
+    String[] channels() default {};
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisListener.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisListener.java
new file mode 100644
index 0000000..252f71a
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/annotation/RedisListener.java
@@ -0,0 +1,19 @@
+package com.njzscloud.common.redis.annotation;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.stereotype.Component;
+
+import java.lang.annotation.*;
+
+/**
+ * Redis 监听器
+ * 
使用方式 {Eg}

+ */
+@Inherited
+@Component
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RedisListener {
+    @AliasFor(annotation = Component.class)
+    String value() default "";
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisOtherProperties.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisOtherProperties.java
new file mode 100644
index 0000000..6e00853
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisOtherProperties.java
@@ -0,0 +1,22 @@
+package com.njzscloud.common.redis.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Redis 配置信息
+ */
+@Getter
+@Setter
+@ConfigurationProperties("spring.redis")
+public class RedisOtherProperties {
+    /**
+     * 是否启用 Redis
+     */
+    private boolean enable = false;
+    /**
+     * 是否使用发布订阅功能
+     */
+    private boolean pubsub = false;
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisServiceAutoConfiguration.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisServiceAutoConfiguration.java
new file mode 100644
index 0000000..ca20f03
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/config/RedisServiceAutoConfiguration.java
@@ -0,0 +1,120 @@
+package com.njzscloud.common.redis.config;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.redis.RedisCli;
+import com.njzscloud.common.redis.annotation.RedisChannel;
+import com.njzscloud.common.redis.annotation.RedisListener;
+import com.njzscloud.common.redis.support.RedisMessageDispatch;
+import io.lettuce.core.RedisURI;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextRefreshedEvent;
+
+import java.time.Duration;
+import java.util.Map;
+
+/**
+ * Redis 配置类
+ */
+@Slf4j
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty(value = "spring.redis.enable", havingValue = "true")
+@EnableConfigurationProperties({RedisProperties.class, RedisOtherProperties.class})
+public class RedisServiceAutoConfiguration {
+
+    /**
+     * Redis 客户端配置
+     *
+     * @param redisProperties      配置（Spring 自带的配置）
+     * @param redisOtherProperties 配置（自定义配置）
+     * @return {@link RedisCli}
+     */
+    @Bean(destroyMethod = "exit")
+    public RedisCli redisCli(RedisProperties redisProperties, RedisOtherProperties redisOtherProperties) {
+        String url = redisProperties.getUrl();
+        RedisURI redisURI;
+        if (url == null || url.isEmpty()) {
+            redisURI = new RedisURI();
+            redisURI.setSsl(redisProperties.isSsl());
+            String username = redisProperties.getUsername();
+            if (StrUtil.isNotBlank(username)) redisURI.setUsername(username);
+            String password = redisProperties.getPassword();
+            if (StrUtil.isNotBlank(password)) redisURI.setPassword(password.toCharArray());
+
+            redisURI.setHost(redisProperties.getHost());
+            redisURI.setPort(redisProperties.getPort());
+            redisURI.setDatabase(redisProperties.getDatabase());
+            Duration timeout = redisProperties.getTimeout();
+            if (timeout != null) redisURI.setTimeout(timeout);
+            String clientName = redisProperties.getClientName();
+            if (StrUtil.isNotBlank(clientName)) redisURI.setClientName(clientName);
+        } else {
+            redisURI = RedisURI.create(url);
+        }
+
+        RedisProperties.Lettuce lettuce = redisProperties.getLettuce();
+        RedisProperties.Pool lettucePool = lettuce.getPool();
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig<>();
+        poolConfig.setMaxTotal(lettucePool.getMaxActive());
+        poolConfig.setMaxIdle(lettucePool.getMaxIdle());
+        poolConfig.setMinIdle(lettucePool.getMinIdle());
+        Duration timeBetweenEvictionRuns = lettucePool.getTimeBetweenEvictionRuns();
+        if (timeBetweenEvictionRuns != null) poolConfig.setTimeBetweenEvictionRuns(timeBetweenEvictionRuns);
+
+        Duration maxWait = lettucePool.getMaxWait();
+        if (maxWait != null) poolConfig.setMaxWait(maxWait);
+
+
+        return new RedisCli(redisURI, poolConfig, redisOtherProperties.isPubsub());
+    }
+
+
+    /**
+     * 发布订阅模式的配置
+     */
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnProperty(value = "spring.redis.pubsub", havingValue = "true")
+    public static class RedisPubSubConfiguration {
+
+        /**
+         * 配置消息派发器
+         *
+         * @param redisCli Redis 客户端 {@link RedisCli}
+         * @return {@link RedisMessageDispatch}
+         */
+        @Bean
+        public RedisMessageDispatch redisMessageDispatch(RedisCli redisCli) {
+            return new RedisMessageDispatch(redisCli);
+        }
+
+        /**
+         * 配置 Spring 事件监听器，当触发 Spring 容器刷新事件{@link ContextRefreshedEvent}时，注册自定义的 Redis 监听器
+         *
+         * @param redisMessageDispatch 消息派发器
+         * @return {@link ApplicationListener}
+         * @see RedisListener
+         * @see RedisChannel
+         */
+        @Bean
+        public ApplicationListener applicationListener(RedisMessageDispatch redisMessageDispatch) {
+            return event -> {
+                Map beansWithAnnotation = event
+                        .getApplicationContext()
+                        .getBeansWithAnnotation(RedisListener.class);
+                beansWithAnnotation.forEach((k, v) -> {
+                    if (log.isDebugEnabled()) {
+                        log.debug("发现 Redis 监听器：【{}】", v.getClass().getName());
+                    }
+                    redisMessageDispatch.subscribe(v);
+                });
+            };
+        }
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisFastjsonCodec.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisFastjsonCodec.java
new file mode 100644
index 0000000..49066d5
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisFastjsonCodec.java
@@ -0,0 +1,63 @@
+package com.njzscloud.common.redis.support;
+
+import com.njzscloud.common.core.fastjson.Fastjson;
+import io.lettuce.core.codec.RedisCodec;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Redis 序列化/反序列化 器（采用 Fastjson，已开启自动类型处理）
+ */
+public class RedisFastjsonCodec implements RedisCodec {
+    private static final byte[] EMPTY = new byte[0];
+
+    @Override
+    public String decodeKey(ByteBuffer bytes) {
+        return Unpooled.wrappedBuffer(bytes).toString(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public Object decodeValue(ByteBuffer bytes) {
+        String jsonStr = Unpooled.wrappedBuffer(bytes).toString(StandardCharsets.UTF_8);
+        return Fastjson.toBean(jsonStr, Object.class);
+    }
+
+    @Override
+    public ByteBuffer encodeKey(String key) {
+        if (key == null) {
+            return ByteBuffer.wrap(EMPTY);
+        }
+        int utf8MaxBytes = ByteBufUtil.utf8MaxBytes(key);
+
+        ByteBuffer buffer = ByteBuffer.allocate(utf8MaxBytes);
+
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(buffer);
+        byteBuf.clear();
+        ByteBufUtil.writeUtf8(byteBuf, key);
+        buffer.limit(byteBuf.writerIndex());
+
+        return buffer;
+    }
+
+    @Override
+    public ByteBuffer encodeValue(Object value) {
+        String jsonStr = Fastjson.toJsonStr(value);
+        if (jsonStr == null) {
+            return ByteBuffer.wrap(EMPTY);
+        }
+        int utf8MaxBytes = ByteBufUtil.utf8MaxBytes(jsonStr);
+
+        ByteBuffer buffer = ByteBuffer.allocate(utf8MaxBytes);
+
+        ByteBuf byteBuf = Unpooled.wrappedBuffer(buffer);
+        byteBuf.clear();
+        ByteBufUtil.writeUtf8(byteBuf, jsonStr);
+        buffer.limit(byteBuf.writerIndex());
+
+        return buffer;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java
new file mode 100644
index 0000000..b03db1d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisListenerRegistrar.java
@@ -0,0 +1,100 @@
+package com.njzscloud.common.redis.support;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.redis.annotation.RedisListener;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.env.Environment;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.*;
+
+/**
+ * Redis 监听器注册器, 暂未使用
+ */
+@Slf4j
+@Setter
+public class RedisListenerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, EnvironmentAware {
+
+    private ResourceLoader resourceLoader;
+
+    private Environment environment;
+
+    @Override
+    public void registerBeanDefinitions(@NotNull AnnotationMetadata metadata, @NotNull BeanDefinitionRegistry registry) {
+        LinkedHashSet candidateComponents = new LinkedHashSet<>();
+
+        AnnotationTypeFilter annotationTypeFilter = new AnnotationTypeFilter(RedisListener.class);
+        ClassPathScanningCandidateComponentProvider scanner = getScanner();
+        scanner.setResourceLoader(this.resourceLoader);
+        scanner.addIncludeFilter(annotationTypeFilter);
+
+        Set basePackages = getBasePackages(metadata);
+        for (String basePackage : basePackages) {
+            basePackage = basePackage.trim();
+            candidateComponents.addAll(scanner.findCandidateComponents(basePackage));
+        }
+
+        for (BeanDefinition candidateComponent : candidateComponents) {
+            String beanClassName = candidateComponent.getBeanClassName();
+            if (StrUtil.isBlank(beanClassName)) {
+                log.warn("当前组件不合法: [{}]", beanClassName);
+                continue;
+            }
+            if (registry.containsBeanDefinition(beanClassName)) {
+                log.debug("当前组件已存在: [{}]", beanClassName);
+                continue;
+            }
+            if (candidateComponent instanceof AnnotatedBeanDefinition) {
+                AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
+
+                AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
+                if (annotationMetadata.isInterface() || annotationMetadata.isAbstract()) continue;
+
+                String name = beanDefinition.getBeanClassName();
+                registry.registerBeanDefinition(Objects.requireNonNull(name), beanDefinition);
+            }
+        }
+    }
+
+
+    protected Set getBasePackages(AnnotationMetadata importingClassMetadata) {
+        Map attributes = importingClassMetadata.getAnnotationAttributes(RedisListener.class.getCanonicalName());
+
+        Set basePackages = new HashSet<>();
+        if (CollUtil.isNotEmpty(attributes)) {
+            for (String pkg : (String[]) attributes.get("value")) {
+                if (StringUtils.hasText(pkg)) {
+                    basePackages.add(pkg);
+                }
+            }
+        }
+
+        if (basePackages.isEmpty()) {
+            basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
+        }
+        return basePackages;
+    }
+
+    protected ClassPathScanningCandidateComponentProvider getScanner() {
+        return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
+            @Override
+            protected boolean isCandidateComponent(@NotNull AnnotatedBeanDefinition beanDefinition) {
+                return beanDefinition.getMetadata().isIndependent() && !beanDefinition.getMetadata().isAnnotation();
+            }
+        };
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisMessageDispatch.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisMessageDispatch.java
new file mode 100644
index 0000000..23e4c07
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/support/RedisMessageDispatch.java
@@ -0,0 +1,157 @@
+package com.njzscloud.common.redis.support;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ClassUtil;
+import com.njzscloud.common.core.fastjson.Fastjson;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.redis.RedisCli;
+import com.njzscloud.common.redis.annotation.RedisChannel;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+/**
+ * Redis 发布订阅模式，消息派发器
+ */
+@Slf4j
+public class RedisMessageDispatch implements RedisPubSubListener {
+    private final RedisCli redisCli;
+
+    /**
+     * 频道/频道模式 —— 监听器对象，消息处理方法
+     */
+    Map>> dispatchList = new HashMap<>();
+
+    /**
+     * 构建消息派发器
+     *
+     * @param redisCli Redis 客户端 {@link RedisCli}
+     */
+    public RedisMessageDispatch(RedisCli redisCli) {
+        this.redisCli = redisCli;
+        this.redisCli.addListener(this);
+    }
+
+    @Override
+    public void message(String channel, Object message) {
+        message(null, channel, message);
+    }
+
+    @Override
+    public void message(String pattern, String channel, Object message) {
+        if (log.isDebugEnabled()) {
+            log.debug("收到 Redis 订阅消息，订阅模式：【{}】、订阅频道：【{}】、消息内容：【{}】", pattern, channel, Fastjson.toJsonStr(message));
+        }
+
+        List> methodList;
+
+        if (pattern == null) methodList = dispatchList.get(channel);
+        else methodList = dispatchList.get(pattern);
+
+        if (methodList == null || methodList.isEmpty()) return;
+
+        for (Tuple2 tuple2 : methodList) {
+            Object target = tuple2.get_0();
+            Method method = tuple2.get_1();
+
+            int parameterCount = method.getParameterCount();
+            Object[] parameters = new Object[parameterCount];
+
+            if (parameterCount == 1) {
+                parameters[0] = message;
+            } else if (parameterCount == 2) {
+                parameters[0] = channel;
+                parameters[1] = message;
+            } else if (parameterCount == 3) {
+                parameters[0] = pattern;
+                parameters[1] = channel;
+                parameters[2] = message;
+            }
+
+            CompletableFuture.runAsync(() -> {
+                try {
+                    method.invoke(target, parameters);
+                } catch (Exception e) {
+                    log.error("Redis 订阅消息处理失败，订阅模式：【{}】、订阅频道：【{}】、消息内容：【{}】", pattern, channel, Fastjson.toJsonStr(message), e);
+                }
+            });
+        }
+    }
+
+    @Override
+    public void subscribed(String channel, long count) {
+        log.info("订阅，频道：{}、订阅数：{}", channel, count);
+    }
+
+    @Override
+    public void psubscribed(String pattern, long count) {
+        log.info("订阅，模式：{}、订阅数：{}", pattern, count);
+    }
+
+    @Override
+    public void unsubscribed(String channel, long count) {
+        log.info("取消订阅，频道：{}、剩余订阅数：{}", channel, count);
+    }
+
+    @Override
+    public void punsubscribed(String pattern, long count) {
+        log.info("取消订阅，模式：{}、剩余订阅数：{}", pattern, count);
+    }
+
+    public void subscribe(Object listener) {
+        Class clazz = listener.getClass();
+        HashSet exclude = CollUtil.newHashSet("wait", "equals", "toString", "hashCode", "getClass", "notify", "notifyAll");
+        Method[] methods = ClassUtil.getPublicMethods(clazz, it -> {
+            int modifiers = it.getModifiers();
+            int parameterCount = it.getParameterCount();
+            String name = it.getName();
+            return !exclude.contains(name) && !Modifier.isStatic(modifiers) && !Modifier.isAbstract(modifiers) && (parameterCount == 0 || parameterCount == 1 || parameterCount == 3);
+        }).toArray(new Method[0]);
+        if (methods.length == 0) return;
+
+        Set registrationPatterns = new HashSet<>();
+        Set registrationChannels = new HashSet<>();
+
+        String clazzName = clazz.getName();
+        for (Method method : methods) {
+            RedisChannel redisChannel = method.getAnnotation(RedisChannel.class);
+            if (redisChannel == null) continue;
+
+            Tuple2 listenerTuple = Tuple2.create(listener, method);
+
+            registrationPatterns.addAll(resolveListener(listenerTuple, redisChannel.patterns(), dispatchList));
+
+            registrationChannels.addAll(resolveListener(listenerTuple, redisChannel.channels(), dispatchList));
+
+            if (log.isDebugEnabled()) {
+                log.debug("Redis 监听器，事件处理方法已注册：【{}#{}】", clazzName, method.getName());
+            }
+        }
+
+        this.redisCli.psubscribe(registrationPatterns);
+        this.redisCli.subscribe(registrationChannels);
+    }
+
+    /**
+     * 计算要订阅的频道或频道模式
+     */
+    private Set resolveListener(Tuple2 listener, String[] channels, Map>> dispatchList) {
+        if (channels == null || channels.length == 0) return Collections.emptySet();
+
+        Set channelSet = Arrays.stream(channels).collect(Collectors.toSet());
+
+        Set registrations = new HashSet<>(channelSet);
+
+        for (String channel : channelSet) {
+            List> listeners = dispatchList.computeIfAbsent(channel, k -> new ArrayList<>());
+            listeners.add(listener);
+        }
+
+        return registrations;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/util/Redis.java b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/util/Redis.java
new file mode 100644
index 0000000..940f6c1
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/java/com/njzscloud/common/redis/util/Redis.java
@@ -0,0 +1,759 @@
+package com.njzscloud.common.redis.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.njzscloud.common.redis.RedisCli;
+import io.lettuce.core.*;
+import io.lettuce.core.api.sync.RedisCommands;
+import io.lettuce.core.output.KeyStreamingChannel;
+import io.lettuce.core.output.KeyValueStreamingChannel;
+import io.lettuce.core.output.ScoredValueStreamingChannel;
+import io.lettuce.core.output.ValueStreamingChannel;
+import lombok.extern.slf4j.Slf4j;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+
+/**
+ * Redis 工具
+ */
+@Slf4j
+@SuppressWarnings("unchecked")
+public final class Redis {
+
+    private final static RedisCli REDIS_CLI;
+
+    static {
+        REDIS_CLI = SpringUtil.getBean(RedisCli.class);
+    }
+
+    // region db/key
+
+    /**
+     * 切换数据库
+     *
+     * @param db 数据库索引
+     * @return boolean
+     * @see RedisCommands#select(int)
+     */
+    public static boolean select(int db) {
+        return REDIS_CLI.exec(it -> {
+            return "OK".equalsIgnoreCase(it.select(db));
+        });
+    }
+
+    /**
+     * 向指定通道发送消息
+     *
+     * @param channel 通道
+     * @param message 消息
+     * @return Long 接收消息的客户端数
+     */
+    public static Long publish(String channel, Object message) {
+        return REDIS_CLI.exec(it -> {
+            return it.publish(channel, message);
+        });
+    }
+
+    public static List keys(String pattern) {
+        return REDIS_CLI.exec(it -> {
+            return it.keys(pattern);
+        });
+    }
+
+    public static String rename(String key, String newKey) {
+        return REDIS_CLI.exec(it -> {
+            return it.rename(key, newKey);
+        });
+    }
+
+    public static Boolean renamenx(String key, String newKey) {
+        return REDIS_CLI.exec(it -> {
+            return it.renamenx(key, newKey);
+        });
+    }
+
+    public static Long del(String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.del(keys);
+        });
+    }
+
+    public static Long exists(String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.exists(keys);
+        });
+    }
+
+    public static Boolean expire(String key, long seconds) {
+        return REDIS_CLI.exec(it -> {
+            return it.expire(key, seconds);
+        });
+    }
+
+    public static Boolean expire(String key, Duration seconds) {
+        return REDIS_CLI.exec(it -> {
+            return it.expire(key, seconds);
+        });
+    }
+
+    public static Boolean expireat(String key, long timestamp) {
+        return REDIS_CLI.exec(it -> {
+            return it.expireat(key, timestamp);
+        });
+    }
+
+    public static Boolean expireat(String key, Date timestamp) {
+        return REDIS_CLI.exec(it -> {
+            return it.expireat(key, timestamp);
+        });
+    }
+
+    public static Boolean expireat(String key, Instant timestamp) {
+        return REDIS_CLI.exec(it -> {
+            return it.expireat(key, timestamp);
+        });
+    }
+    // endregion
+
+    // region str
+
+    public static  V get(String key) {
+        return REDIS_CLI.exec(it -> (V) it.get(key));
+    }
+
+    public static String set(String key, Object value, SetArgs setArgs) {
+        return REDIS_CLI.exec(it -> {
+            return it.set(key, value, setArgs);
+        });
+    }
+
+    public static String set(String key, Object value) {
+        return REDIS_CLI.exec(it -> {
+            return it.set(key, value);
+        });
+    }
+
+    public static String setex(String key, long seconds, Object value) {
+        return REDIS_CLI.exec(it -> {
+            return it.setex(key, seconds, value);
+        });
+    }
+
+    public static Boolean setnx(String key, Object value) {
+        return REDIS_CLI.exec(it -> {
+            return it.setnx(key, value);
+        });
+    }
+
+    public static List> mget(String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.mget(keys);
+        });
+    }
+
+    public static Long mget(KeyValueStreamingChannel channel, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.mget(channel, keys);
+        });
+    }
+
+    public static String mset(Map map) {
+        return REDIS_CLI.exec(it -> {
+            return it.mset(map);
+        });
+    }
+
+    public static Boolean msetnx(Map map) {
+        return REDIS_CLI.exec(it -> {
+            return it.msetnx(map);
+        });
+    }
+
+    public static Long incr(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.incr(key);
+        });
+    }
+
+    public static Long incrby(String key, long amount) {
+        return REDIS_CLI.exec(it -> {
+            return it.incrby(key, amount);
+        });
+    }
+
+    public static Long decr(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.decr(key);
+        });
+    }
+
+    public static Long decrby(String key, long amount) {
+        return REDIS_CLI.exec(it -> {
+            return it.decrby(key, amount);
+        });
+    }
+
+    public static Long strlen(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.strlen(key);
+        });
+    }
+
+
+    public static Long bitcount(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitcount(key);
+        });
+    }
+
+    public static Long bitcount(String key, long start, long end) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitcount(key, start, end);
+        });
+    }
+
+    public static List bitfield(String key, BitFieldArgs bitFieldArgs) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitfield(key, bitFieldArgs);
+        });
+    }
+
+    public static Long bitpos(String key, boolean state) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitpos(key, state);
+        });
+    }
+
+    public static Long bitpos(String key, boolean state, long start) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitpos(key, state, start);
+        });
+    }
+
+    public static Long bitpos(String key, boolean state, long start, long end) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitpos(key, state, start, end);
+        });
+    }
+
+    public static Long bitopAnd(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitopAnd(destination, keys);
+        });
+    }
+
+    public static Long bitopNot(String destination, String source) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitopNot(destination, source);
+        });
+    }
+
+    public static Long bitopOr(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitopOr(destination, keys);
+        });
+    }
+
+    public static Long bitopXor(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.bitopXor(destination, keys);
+        });
+    }
+    // endregion
+
+    // region hash
+    public static Long hdel(String key, String... fields) {
+        return REDIS_CLI.exec(it -> {
+            return it.hdel(key, fields);
+        });
+    }
+
+    public static Boolean hexists(String key, String field) {
+        return REDIS_CLI.exec(it -> {
+            return it.hexists(key, field);
+        });
+    }
+
+    public static  V hget(String key, String field) {
+        return REDIS_CLI.exec(it -> (V) it.hget(key, field));
+    }
+
+    public static Map hgetall(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hgetall(key);
+        });
+    }
+
+    public static Long hgetall(KeyValueStreamingChannel channel, String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hgetall(channel, key);
+        });
+    }
+
+    public static List hkeys(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hkeys(key);
+        });
+    }
+
+    public static Long hkeys(KeyStreamingChannel channel, String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hkeys(channel, key);
+        });
+    }
+
+    public static Long hlen(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hlen(key);
+        });
+    }
+
+    public static List> hmget(String key, String... fields) {
+        return REDIS_CLI.exec(it -> {
+            return it.hmget(key, fields);
+        });
+    }
+
+    public static Long hmget(KeyValueStreamingChannel channel, String key, String... fields) {
+        return REDIS_CLI.exec(it -> {
+            return it.hmget(channel, key, fields);
+        });
+    }
+
+    public static String hmset(String key, Map map) {
+        return REDIS_CLI.exec(it -> {
+            return it.hmset(key, map);
+        });
+    }
+
+    public static Boolean hset(String key, String field, Object value) {
+        return REDIS_CLI.exec(it -> {
+            return it.hset(key, field, value);
+        });
+    }
+
+    public static Long hset(String key, Map map) {
+        return REDIS_CLI.exec(it -> {
+            return it.hset(key, map);
+        });
+    }
+
+    public static Boolean hsetnx(String key, String field, Object value) {
+        return REDIS_CLI.exec(it -> {
+            return it.hsetnx(key, field, value);
+        });
+    }
+
+    public static Long hstrlen(String key, String field) {
+        return REDIS_CLI.exec(it -> {
+            return it.hstrlen(key, field);
+        });
+    }
+
+    public static List hvals(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hvals(key);
+        });
+    }
+
+    public static Long hvals(ValueStreamingChannel channel, String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.hvals(channel, key);
+        });
+    }
+    // endregion
+
+    // region list
+    public static  V lindex(String key, long index) {
+        return REDIS_CLI.exec(it -> (V) it.lindex(key, index));
+    }
+
+
+    public static Long llen(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.llen(key);
+        });
+    }
+
+    public static  V lpop(String key) {
+        return REDIS_CLI.exec(it -> (V) it.lpop(key));
+    }
+
+    public static  List lpop(String key, long count) {
+        return REDIS_CLI.exec(it -> (List) it.lpop(key, count));
+    }
+
+    public static  Long lpush(String key, V... values) {
+        return REDIS_CLI.exec(it -> {
+            return it.lpush(key, values);
+        });
+    }
+
+    public static  Long lpushx(String key, V... values) {
+        return REDIS_CLI.exec(it -> {
+            return it.lpushx(key, values);
+        });
+    }
+
+    public static  List lrange(String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> (List) it.lrange(key, start, stop));
+    }
+
+    public static  Long lrange(ValueStreamingChannel channel, String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> {
+            return it.lrange((ValueStreamingChannel) channel, key, start, stop);
+        });
+    }
+
+    public static  Long lrem(String key, long count, V value) {
+        return REDIS_CLI.exec(it -> {
+            return it.lrem(key, count, value);
+        });
+    }
+
+    public static  String lset(String key, long index, V value) {
+        return REDIS_CLI.exec(it -> {
+            return it.lset(key, index, value);
+        });
+    }
+
+    public static String ltrim(String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> {
+            return it.ltrim(key, start, stop);
+        });
+    }
+
+    public static  V rpop(String key) {
+        return REDIS_CLI.exec(it -> (V) it.rpop(key));
+    }
+
+    public static  List rpop(String key, long count) {
+        return REDIS_CLI.exec(it -> (List) it.rpop(key, count));
+    }
+
+    public static  Long rpush(String key, V... values) {
+        return REDIS_CLI.exec(it -> {
+            return it.rpush(key, values);
+        });
+    }
+
+    public static  Long rpushx(String key, V... values) {
+        return REDIS_CLI.exec(it -> {
+            return it.rpushx(key, values);
+        });
+    }
+    // endregion
+
+    // region set
+    public static  Long sadd(String key, V... members) {
+        return REDIS_CLI.exec(it -> {
+            return it.sadd(key, members);
+        });
+    }
+
+    public static Long scard(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.scard(key);
+        });
+    }
+
+    public static  Set sdiff(String... keys) {
+        return REDIS_CLI.exec(it -> (Set) it.sdiff(keys));
+    }
+
+    public static  Long sdiff(ValueStreamingChannel channel, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sdiff((ValueStreamingChannel) channel, keys);
+        });
+    }
+
+    public static Long sdiffstore(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sdiffstore(destination, keys);
+        });
+    }
+
+    public static  Set sinter(String... keys) {
+        return REDIS_CLI.exec(it -> (Set) it.sinter(keys));
+    }
+
+    public static  Long sinter(ValueStreamingChannel channel, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sinter((ValueStreamingChannel) channel, keys);
+        });
+    }
+
+    public static Long sinterstore(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sinterstore(destination, keys);
+        });
+    }
+
+    public static  Boolean sismember(String key, V member) {
+        return REDIS_CLI.exec(it -> {
+            return it.sismember(key, member);
+        });
+    }
+
+    public static  List smismember(String key, V... member) {
+        return REDIS_CLI.exec(it -> {
+            return it.smismember(key, member);
+        });
+    }
+
+    public static  Set smembers(String key) {
+        return REDIS_CLI.exec(it -> (Set) it.smembers(key));
+    }
+
+    public static  Long smembers(ValueStreamingChannel channel, String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.smembers((ValueStreamingChannel) channel, key);
+        });
+    }
+
+    public static  V spop(String key) {
+        return REDIS_CLI.exec(it -> (V) it.spop(key));
+    }
+
+    public static  Set spop(String key, long count) {
+        return REDIS_CLI.exec(it -> (Set) it.spop(key, count));
+    }
+
+    public static  V srandmember(String key) {
+        return REDIS_CLI.exec(it -> (V) it.srandmember(key));
+    }
+
+    public static  List srandmember(String key, long count) {
+        return REDIS_CLI.exec(it -> (List) it.srandmember(key, count));
+    }
+
+    public static  Long srandmember(ValueStreamingChannel channel, String key, long count) {
+        return REDIS_CLI.exec(it -> {
+            return it.srandmember((ValueStreamingChannel) channel, key, count);
+        });
+    }
+
+    public static  Long srem(String key, V... members) {
+        return REDIS_CLI.exec(it -> {
+            return it.srem(key, members);
+        });
+    }
+
+    public static  Set sunion(String... keys) {
+        return REDIS_CLI.exec(it -> (Set) it.sunion(keys));
+    }
+
+    public static  Long sunion(ValueStreamingChannel channel, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sunion((ValueStreamingChannel) channel, keys);
+        });
+    }
+
+    public static Long sunionstore(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.sunionstore(destination, keys);
+        });
+    }
+
+    // endregion
+
+    // region sorted set
+    public static  Long zadd(String key, double score, V member) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, score, member);
+        });
+    }
+
+    public static Long zadd(String key, Object... scoresAndValues) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, scoresAndValues);
+        });
+    }
+
+    public static  Long zadd(String key, ScoredValue... scoredValues) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, (ScoredValue[]) scoredValues);
+        });
+    }
+
+    public static  Long zadd(String key, ZAddArgs zAddArgs, double score, V member) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, zAddArgs, score, member);
+        });
+    }
+
+    public static Long zadd(String key, ZAddArgs zAddArgs, Object... scoresAndValues) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, zAddArgs, scoresAndValues);
+        });
+    }
+
+    public static  Long zadd(String key, ZAddArgs zAddArgs, ScoredValue... scoredValues) {
+        return REDIS_CLI.exec(it -> {
+            return it.zadd(key, zAddArgs, (ScoredValue[]) scoredValues);
+        });
+    }
+
+    public static Long zcard(String key) {
+        return REDIS_CLI.exec(it -> {
+            return it.zcard(key);
+        });
+    }
+
+    public static Long zcount(String key, Range range) {
+        return REDIS_CLI.exec(it -> {
+            return it.zcount(key, range);
+        });
+    }
+
+    public static  List zdiff(String... keys) {
+        return REDIS_CLI.exec(it -> (List) it.zdiff(keys));
+    }
+
+    public static Long zdiffstore(String destKey, String... srcKeys) {
+        return REDIS_CLI.exec(it -> {
+            return it.zdiffstore(destKey, srcKeys);
+        });
+    }
+
+    public static  List zinter(String... keys) {
+        return REDIS_CLI.exec(it -> (List) it.zinter(keys));
+    }
+
+    public static  List zinter(ZAggregateArgs aggregateArgs, String... keys) {
+        return REDIS_CLI.exec(it -> (List) it.zinter(aggregateArgs, keys));
+    }
+
+    public static Long zinterstore(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.zinterstore(destination, keys);
+        });
+    }
+
+    public static Long zinterstore(String destination, ZStoreArgs storeArgs, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.zinterstore(destination, storeArgs, keys);
+        });
+    }
+
+    public static  V zrandmember(String key) {
+        return REDIS_CLI.exec(it -> (V) it.zrandmember(key));
+    }
+
+    public static  List zrandmember(String key, long count) {
+        return REDIS_CLI.exec(it -> (List) it.zrandmember(key, count));
+    }
+
+    public static  ScoredValue zrandmemberWithScores(String key) {
+        return REDIS_CLI.exec(it -> (ScoredValue) it.zrandmemberWithScores(key));
+    }
+
+    public static  List> zrandmemberWithScores(String key, long count) {
+        List> scoredValues = REDIS_CLI.exec(it -> (List>) it.zrandmemberWithScores(key, count));
+
+        if (scoredValues == null || scoredValues.isEmpty()) return CollUtil.empty(null);
+
+        ArrayList> list = new ArrayList<>(scoredValues.size());
+        for (ScoredValue scoredValue : scoredValues) {
+            double score = scoredValue.getScore();
+            Object value = scoredValue.getValue();
+            ScoredValue val = (ScoredValue) ScoredValue.fromNullable(score, (V) value);
+            list.add(val);
+        }
+
+        return list;
+    }
+
+    public static  List zrange(String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> (List) it.zrange(key, start, stop));
+    }
+
+    public static  Long zrange(ValueStreamingChannel channel, String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> {
+            return it.zrange((ValueStreamingChannel) channel, key, start, stop);
+        });
+    }
+
+    public static  List> zrangeWithScores(String key, long start, long stop) {
+        List> scoredValues = REDIS_CLI.exec(it -> (List>) it.zrangeWithScores(key, start, stop));
+        if (scoredValues == null || scoredValues.isEmpty()) return CollUtil.empty(null);
+
+        ArrayList> list = new ArrayList<>(scoredValues.size());
+        for (ScoredValue scoredValue : scoredValues) {
+            double score = scoredValue.getScore();
+            Object value = scoredValue.getValue();
+            ScoredValue val = (ScoredValue) ScoredValue.fromNullable(score, (V) value);
+            list.add(val);
+        }
+
+        return list;
+    }
+
+    public static  Long zrangeWithScores(ScoredValueStreamingChannel channel, String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> {
+            return it.zrangeWithScores((ScoredValueStreamingChannel) channel, key, start, stop);
+        });
+    }
+
+    public static  List zrevrange(String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> (List) it.zrevrange(key, start, stop));
+    }
+
+    public static  Long zrevrange(ValueStreamingChannel channel, String key, long start, long stop) {
+        return REDIS_CLI.exec(it -> {
+            return it.zrevrange((ValueStreamingChannel) channel, key, start, stop);
+        });
+    }
+
+    public static  List zunion(String... keys) {
+        return REDIS_CLI.exec(it -> (List) it.zunion(keys));
+    }
+
+    public static  List zunion(ZAggregateArgs aggregateArgs, String... keys) {
+        return REDIS_CLI.exec(it -> (List) it.zunion(aggregateArgs, keys));
+    }
+
+    public static  List> zunionWithScores(ZAggregateArgs aggregateArgs, String... keys) {
+        List> scoredValues = REDIS_CLI.exec(it -> (List>) it.zunionWithScores(aggregateArgs, keys));
+        if (scoredValues == null || scoredValues.isEmpty()) return CollUtil.empty(null);
+
+        ArrayList> list = new ArrayList<>(scoredValues.size());
+        for (ScoredValue scoredValue : scoredValues) {
+            double score = scoredValue.getScore();
+            Object value = scoredValue.getValue();
+            ScoredValue val = (ScoredValue) ScoredValue.fromNullable(score, (V) value);
+            list.add(val);
+        }
+        return list;
+    }
+
+    public static  List> zunionWithScores(String... keys) {
+        List> scoredValues = REDIS_CLI.exec(it -> (List>) it.zunionWithScores(keys));
+        if (scoredValues == null || scoredValues.isEmpty()) return CollUtil.empty(null);
+
+        ArrayList> list = new ArrayList<>(scoredValues.size());
+        for (ScoredValue scoredValue : scoredValues) {
+            double score = scoredValue.getScore();
+            Object value = scoredValue.getValue();
+            ScoredValue val = (ScoredValue) ScoredValue.fromNullable(score, (V) value);
+            list.add(val);
+        }
+        return list;
+    }
+
+    public static Long zunionstore(String destination, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.zunionstore(destination, keys);
+        });
+    }
+
+    public static Long zunionstore(String destination, ZStoreArgs storeArgs, String... keys) {
+        return REDIS_CLI.exec(it -> {
+            return it.zunionstore(destination, storeArgs, keys);
+        });
+    }
+    // endregion
+}
+
diff --git a/njzscloud-common/njzscloud-common-redis/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-redis/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..adb4e63
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-redis/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
+  com.njzscloud.common.redis.config.RedisServiceAutoConfiguration
diff --git a/njzscloud-common/njzscloud-common-security/pom.xml b/njzscloud-common/njzscloud-common-security/pom.xml
new file mode 100644
index 0000000..876db5f
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/pom.xml
@@ -0,0 +1,53 @@
+
+
+    4.0.0
+    
+        com.njzscloud
+        njzscloud-common
+        0.0.1
+    
+
+    njzscloud-common-security
+
+    
+        8
+        8
+        UTF-8
+    
+
+    
+        
+            com.njzscloud
+            njzscloud-common-core
+            provided
+        
+
+        
+
+
+        
+            javax.servlet
+            javax.servlet-api
+        
+
+        
+        
+            org.springframework.boot
+            spring-boot-starter-security
+        
+
+        
+        
+            org.junit.jupiter
+            junit-jupiter-engine
+            test
+        
+
+    
+
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityAutoConfiguration.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityAutoConfiguration.java
new file mode 100644
index 0000000..2561f29
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityAutoConfiguration.java
@@ -0,0 +1,161 @@
+package com.njzscloud.common.security.config;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.njzscloud.common.security.handler.AccessDeniedExceptionHandler;
+import com.njzscloud.common.security.handler.AuthExceptionHandler;
+import com.njzscloud.common.security.handler.LogoutPostHandler;
+import com.njzscloud.common.security.module.password.PasswordAuthenticationProvider;
+import com.njzscloud.common.security.module.password.PasswordLoginPreparer;
+import com.njzscloud.common.security.permission.DefaultPermissionManager;
+import com.njzscloud.common.security.permission.PermissionManager;
+import com.njzscloud.common.security.permission.PermissionSecurityMetaDataSource;
+import com.njzscloud.common.security.permission.PermissionVoter;
+import com.njzscloud.common.security.support.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.vote.AffirmativeBased;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Configuration
+@EnableConfigurationProperties({WebSecurityProperties.class})
+public class WebSecurityAutoConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(LoginHistoryRecorder.class)
+    public LoginHistoryRecorder loginHistoryRecorder() {
+        return new DefaultLoginHistoryRecorder();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(PermissionManager.class)
+    public PermissionManager permissionManager() {
+        return new DefaultPermissionManager();
+    }
+
+    @Bean
+    @ConditionalOnBean({IUserService.class, IRoleService.class, IResourceService.class})
+    public PasswordAuthenticationProvider passwordAuthenticationProvider(IUserService iUserService, IRoleService iRoleService, IResourceService iResourceService) {
+        return new PasswordAuthenticationProvider(iUserService, iRoleService, iResourceService);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean({IUserService.class, IRoleService.class, IResourceService.class})
+    public DefaultAuthenticationProvider defaultAuthenticationProvider() {
+        return new DefaultAuthenticationProvider();
+    }
+
+    @Bean
+    @ConditionalOnBean({IUserService.class, IRoleService.class, IResourceService.class})
+    public PasswordLoginPreparer passwordLoginPreparer() {
+        return new PasswordLoginPreparer();
+    }
+
+    /**
+     * SpringSecurity 配置
+     */
+    @Slf4j
+    @Configuration
+    @RequiredArgsConstructor
+    public static class AuthenticationServerConfigurer {
+
+        private final LoginHistoryRecorder loginHistoryRecorder;
+
+        private final WebSecurityProperties webSecurityProperties;
+
+        private final PermissionManager permissionManager;
+
+        private final ObjectProvider loginPreparerObjectProvider;
+
+        private final ObjectProvider abstractAuthenticationProviderObjectProvider;
+
+        private FilterSecurityInterceptor createFilterSecurityInterceptor(HttpSecurity http, AuthenticationManager authenticationManager) {
+            FilterSecurityInterceptor securityInterceptor = new FilterSecurityInterceptor();
+            securityInterceptor.setSecurityMetadataSource(new PermissionSecurityMetaDataSource(permissionManager));
+            securityInterceptor.setAccessDecisionManager(new AffirmativeBased(Collections.singletonList(new PermissionVoter())));
+            securityInterceptor.setAuthenticationManager(authenticationManager);
+            securityInterceptor.setRejectPublicInvocations(false);
+            securityInterceptor.setValidateConfigAttributes(false);
+            securityInterceptor.afterPropertiesSet();
+
+            http.setSharedObject(FilterSecurityInterceptor.class, securityInterceptor);
+            return securityInterceptor;
+        }
+
+        @Bean
+        public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+            List loginPreparers = loginPreparerObjectProvider.orderedStream().collect(Collectors.toList());
+            List authenticationProviders = abstractAuthenticationProviderObjectProvider.orderedStream().collect(Collectors.toList());
+            ProviderManager providerManager = new ProviderManager(authenticationProviders);
+
+            FilterSecurityInterceptor securityInterceptor = createFilterSecurityInterceptor(http, providerManager);
+
+
+            LogoutPostHandler logoutPostHandler = new LogoutPostHandler();
+            return http
+
+                    .csrf().disable()
+                    .anonymous().disable()
+                    .requestCache().disable()
+                    .sessionManagement().disable()
+
+                    .securityContext()
+                    .securityContextRepository(new TokenSecurityContextRepository())
+
+                    .and()
+                    .addFilter(securityInterceptor)
+                    // 退出登录
+                    .logout()
+
+                    .addLogoutHandler(logoutPostHandler)
+                    .logoutSuccessHandler(logoutPostHandler)
+
+                    .and()
+                    .apply(new CombineAuthenticationConfigurer())
+                    .authenticationManager(providerManager)
+                    .loginPreparers(loginPreparers)
+                    .loginHistoryRecorder(loginHistoryRecorder)
+
+                    // 异常处理
+                    .and()
+                    .exceptionHandling()
+                    .authenticationEntryPoint(AuthExceptionHandler.INSTANCE)
+                    .accessDeniedHandler(AccessDeniedExceptionHandler.INSTANCE)
+
+                    .and()
+                    .build();
+        }
+
+        @Bean
+        public WebSecurityCustomizer webSecurityCustomizer() {
+            return (web) -> {
+                WebSecurity.IgnoredRequestConfigurer ignoring = web.ignoring();
+                Set authIgnore = webSecurityProperties.getAuthIgnores();
+                if (CollUtil.isNotEmpty(authIgnore)) {
+                    ignoring.antMatchers(ArrayUtil.toArray(authIgnore, String.class));
+                }
+                ignoring.antMatchers("/error");
+            };
+        }
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityProperties.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityProperties.java
new file mode 100644
index 0000000..b36d348
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/config/WebSecurityProperties.java
@@ -0,0 +1,24 @@
+package com.njzscloud.common.security.config;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.time.Duration;
+import java.util.Set;
+
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "spring.security")
+public class WebSecurityProperties {
+    /**
+     * TOKEN 过期时间,  ≤ 0-->永久,默认 0
+     */
+    private Duration tokenExp = Duration.ofMillis(0);
+    /**
+     * 不进行认证校验的路径, 按 Ant 格式匹配
+     */
+    private Set authIgnores = CollUtil.empty(Set.class);
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/AuthWay.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/AuthWay.java
new file mode 100644
index 0000000..bdce65e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/AuthWay.java
@@ -0,0 +1,23 @@
+package com.njzscloud.common.security.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：auth_way
+ * 字典名称：登录方式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum AuthWay implements DictStr {
+    ANONYMOUS("Anonymous", "匿名登录"),
+    PASSWORD("Password", "账号密码登录"),
+    PHONE("Phone", "手机验证码登录"),
+    WECHAT("Wechat", "微信登录"),
+    WECHAT_MINI("WechatMini", "微信小程序登录"),
+    ;
+
+    private final String val;
+    private final String txt;
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/Constants.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/Constants.java
new file mode 100644
index 0000000..367cea1
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/Constants.java
@@ -0,0 +1,33 @@
+package com.njzscloud.common.security.contant;
+
+import cn.hutool.core.collection.CollUtil;
+import com.njzscloud.common.core.utils.Key;
+import com.njzscloud.common.security.support.Token;
+import com.njzscloud.common.security.support.UserDetail;
+
+/**
+ * 常量
+ */
+public final class Constants {
+    // 随机码字符串池
+    public static final String RANDOM_BASE_STRING = "23456789abcdefjhjkmnpqrstuvwxyzABCDEFJHJKMNPQRSTUVWXYZ";
+
+    public static final String ROLE_AUTHENTICATED = "ROLE_AUTHENTICATED";
+    public static final String ROLE_ANONYMOUS = "ROLE_ANONYMOUS";
+    public static final String ROLE_ADMIN = "ROLE_ADMIN";
+
+    // Redis 订阅频道  权限更新
+    public static final String REDIS_TOPIC_PERMISSION_UPDATE = "permission_update";
+
+    public static final Key TOKEN_CACHE_KEY = Key.create("token:{userId}:{tid}");
+    public static final String TOKEN_STR_SEPARATOR = ",";
+
+    /**
+     * 匿名用户
+     */
+    public static final UserDetail ANONYMOUS_USER = new UserDetail()
+            .setUserId(0L)
+            .setAccountId(0L)
+            .setRoles(CollUtil.newHashSet(ROLE_ANONYMOUS))
+            .setToken(Token.create(0L, 0L, AuthWay.ANONYMOUS));
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/EndpointAccessModel.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/EndpointAccessModel.java
new file mode 100644
index 0000000..e71e4c0
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/contant/EndpointAccessModel.java
@@ -0,0 +1,22 @@
+package com.njzscloud.common.security.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：endpoint_access_model
+ * 字典名称：接口访问模式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum EndpointAccessModel implements DictStr {
+    ANONYMOUS("Anonymous", "允许匿名访问"),
+    LOGINED("Logined", "允许已登录用户访问"),
+    AUTHENTICATED("Authenticated", "仅拥有权限的用户访问"),
+    FORBIDDEN("Forbidden", "禁止访问"),
+    ;
+
+    private final String val;
+    private final String txt;
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/ForbiddenAccessException.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/ForbiddenAccessException.java
new file mode 100644
index 0000000..be5875e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/ForbiddenAccessException.java
@@ -0,0 +1,19 @@
+package com.njzscloud.common.security.ex;
+
+
+import org.springframework.security.access.AccessDeniedException;
+
+/**
+ * 禁止访问
+ */
+public class ForbiddenAccessException extends AccessDeniedException {
+
+    public ForbiddenAccessException(String msg) {
+        super(msg);
+    }
+
+    public ForbiddenAccessException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/MissingPermissionException.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/MissingPermissionException.java
new file mode 100644
index 0000000..fc0ba58
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/MissingPermissionException.java
@@ -0,0 +1,16 @@
+package com.njzscloud.common.security.ex;
+
+
+import org.springframework.security.access.AccessDeniedException;
+
+public class MissingPermissionException extends AccessDeniedException {
+
+    public MissingPermissionException(String msg) {
+        super(msg);
+    }
+
+    public MissingPermissionException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/UserLoginException.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/UserLoginException.java
new file mode 100644
index 0000000..da90a0c
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/ex/UserLoginException.java
@@ -0,0 +1,29 @@
+package com.njzscloud.common.security.ex;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import org.springframework.security.core.AuthenticationException;
+
+/**
+ * 认证异常
+ */
+public class UserLoginException extends AuthenticationException {
+
+    public final ExceptionMsg msg;
+
+    public UserLoginException(ExceptionMsg exceptionMsg, String message) {
+        super(message);
+        this.msg = exceptionMsg;
+    }
+
+    public UserLoginException(Throwable cause, ExceptionMsg exceptionMsg, String message, Object... param) {
+        super(StrUtil.format(message, param), cause);
+        this.msg = exceptionMsg;
+    }
+
+    public UserLoginException(Throwable cause, ExceptionMsg exceptionMsg, String message) {
+        super(message, cause);
+        this.msg = exceptionMsg;
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java
new file mode 100644
index 0000000..7222763
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AccessDeniedExceptionHandler.java
@@ -0,0 +1,52 @@
+package com.njzscloud.common.security.handler;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.core.http.constant.Mime;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.security.ex.MissingPermissionException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AuthorizationServiceException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 权限异常
+ */
+@Slf4j
+public class AccessDeniedExceptionHandler implements AccessDeniedHandler {
+
+    public static final AccessDeniedExceptionHandler INSTANCE = new AccessDeniedExceptionHandler();
+
+    private AccessDeniedExceptionHandler() {
+    }
+
+    @Override
+    public void handle(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AccessDeniedException accessDeniedException
+    ) throws IOException, ServletException {
+        R r;
+        if (accessDeniedException instanceof AuthorizationServiceException) {
+            log.error("权限校验失败: {}", request.getRequestURI(), accessDeniedException);
+            r = R.failed(ExceptionMsg.SYS_ERR_MSG, "权限加载失败");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        } else if (accessDeniedException instanceof MissingPermissionException) {
+            log.error("权限未配置: {}", request.getRequestURI(), accessDeniedException);
+            r = R.failed(ExceptionMsg.SYS_ERR_MSG, "当前请求未分配权限");
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        } else {
+            log.error("暂无权限: {}", request.getRequestURI(), accessDeniedException);
+            r = R.failed(ExceptionMsg.CLI_ERR_MSG, accessDeniedException.getMessage());
+            response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+        }
+        ServletUtil.write(response, Jackson.toJsonStr(r), Mime.u8Val(Mime.JSON));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java
new file mode 100644
index 0000000..3fe45e7
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/AuthExceptionHandler.java
@@ -0,0 +1,46 @@
+package com.njzscloud.common.security.handler;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.core.http.constant.Mime;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.core.utils.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+
+/**
+ * 认证异常
+ */
+@Slf4j
+public class AuthExceptionHandler implements AuthenticationEntryPoint {
+    public static final AuthExceptionHandler INSTANCE = new AuthExceptionHandler();
+
+    private AuthExceptionHandler() {
+    }
+
+    @Override
+    public void commence(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException authException
+    ) throws IOException, ServletException {
+        log.error("未登录: {}", request.getRequestURI(), authException);
+        R r;
+        if (authException instanceof AuthenticationCredentialsNotFoundException) {
+            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            r = R.failed(ExceptionMsg.CLI_ERR_MSG, "登录凭证无效");
+        } else {
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            r = R.failed(ExceptionMsg.SYS_ERR_MSG, "无法进行用户校验");
+        }
+        ServletUtil.write(response, Jackson.toJsonStr(r), Mime.u8Val(Mime.JSON));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java
new file mode 100644
index 0000000..5c6c9b4
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LoginPostHandler.java
@@ -0,0 +1,97 @@
+package com.njzscloud.common.security.handler;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.core.http.constant.Mime;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.security.contant.AuthWay;
+import com.njzscloud.common.security.ex.UserLoginException;
+import com.njzscloud.common.security.support.AuthenticationDetails;
+import com.njzscloud.common.security.support.LoginHistory;
+import com.njzscloud.common.security.support.LoginHistoryRecorder;
+import com.njzscloud.common.security.support.UserDetail;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * 登陆后置处理器
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class LoginPostHandler implements AuthenticationSuccessHandler, AuthenticationFailureHandler {
+
+    private final LoginHistoryRecorder loginHistoryRecorder;
+
+    /**
+     * 登陆失败
+     */
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request,
+                                        HttpServletResponse response,
+                                        AuthenticationException exception) throws IOException, ServletException {
+        log.error("登录失败", exception);
+        R r;
+        if (exception instanceof UserLoginException) {
+            r = R.failed(((UserLoginException) exception).msg, exception.getMessage());
+        } else if (exception instanceof UsernameNotFoundException) {
+            r = R.failed(ExceptionMsg.CLI_ERR_MSG, "账号或密码错误");
+        } else {
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            r = R.failed(ExceptionMsg.SYS_ERR_MSG, "无法进行用户校验");
+        }
+        ServletUtil.write(response, Jackson.toJsonStr(r), Mime.u8Val(Mime.JSON));
+    }
+
+    /**
+     * 登陆成功
+     */
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request,
+                                        HttpServletResponse response,
+                                        Authentication authentication) throws IOException, ServletException {
+        R r = R.success(authentication.getPrincipal());
+        ServletUtil.write(response, Jackson.toJsonStr(r), Mime.u8Val(Mime.JSON));
+    }
+
+    /**
+     * 记录登陆日志
+     *
+     * @param authentication 已认证的认证对象
+     */
+    public void recordLoginHistory(Authentication authentication) {
+        AuthenticationDetails details = (AuthenticationDetails) authentication.getDetails();
+        UserDetail userDetail = (UserDetail) authentication.getPrincipal();
+        AuthWay authWay = userDetail.getAuthWay();
+
+        long userAccountId = userDetail.getAccountId();
+        long userId = userDetail.getUserId();
+        LocalDateTime now = LocalDateTime.now();
+        LoginHistory loginHistory = new LoginHistory()
+                .setUserId(userId)
+                .setAccountId(userAccountId)
+                .setLoginTime(now)
+                .setAuthWay(authWay)
+                .setIp(details.getRemoteAddress())
+                .setUserAgent(details.getUserAgent());
+        CompletableFuture.runAsync(() -> {
+            try {
+                loginHistoryRecorder.record(loginHistory);
+            } catch (Throwable e) {
+                log.error("登录日志记录失败", e);
+            }
+        });
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java
new file mode 100644
index 0000000..8685958
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/handler/LogoutPostHandler.java
@@ -0,0 +1,54 @@
+package com.njzscloud.common.security.handler;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.core.http.constant.Mime;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.security.support.Token;
+import com.njzscloud.common.security.support.UserAuthenticationToken;
+import com.njzscloud.common.security.util.SecurityUtil;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.logout.LogoutHandler;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 退出登陆处理器
+ */
+public class LogoutPostHandler implements LogoutSuccessHandler, LogoutHandler {
+
+    /**
+     * 退出登陆
+     */
+    @Override
+    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
+        UserAuthenticationToken userAuthenticationToken = (UserAuthenticationToken) authentication;
+        Token token = (Token) userAuthenticationToken.getCredentials();
+        SecurityUtil.removeToken(token);
+    }
+
+    /**
+     * 退出登陆成功
+     */
+    @Override
+    public void onLogoutSuccess(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Authentication authentication
+    ) throws IOException, ServletException {
+        R r;
+        if (authentication == null) {
+            r = R.failed(Boolean.FALSE, ExceptionMsg.CLI_ERR_MSG, "未登陆，无需操作");
+        } else {
+            r = R.success(Boolean.TRUE);
+        }
+        ServletUtil.write(response, Jackson.toJsonStr(r), Mime.u8Val(Mime.JSON));
+    }
+
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordAuthenticationProvider.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordAuthenticationProvider.java
new file mode 100644
index 0000000..fe851fa
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordAuthenticationProvider.java
@@ -0,0 +1,62 @@
+package com.njzscloud.common.security.module.password;
+
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.security.contant.AuthWay;
+import com.njzscloud.common.security.ex.UserLoginException;
+import com.njzscloud.common.security.support.*;
+import com.njzscloud.common.security.util.EncryptUtil;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Set;
+
+/**
+ * 账号密码登录认证器
+ */
+@RequiredArgsConstructor
+public class PasswordAuthenticationProvider extends AbstractAuthenticationProvider {
+    private final IUserService iUserService;
+    private final IRoleService iRoleService;
+    private final IResourceService iResourceService;
+
+    /**
+     * 读取用户信息
+     *
+     * @param loginForm 登录表单
+     * @return 用户信息
+     */
+    @Override
+    protected UserDetail retrieveUser(LoginForm loginForm) throws UserLoginException {
+        PasswordLoginForm passwordLoginForm = (PasswordLoginForm) loginForm;
+        String account = passwordLoginForm.getAccount();
+        UserDetail userDetail = iUserService.selectUserByAccount(account);
+        if (userDetail == null) throw new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "账号或密码错误");
+        Long userId = userDetail.getUserId();
+        Set roles = iRoleService.selectRoleByUserId(userId);
+        Resource resource = iResourceService.selectResourceByUserId(userId);
+        return userDetail
+                .setAuthWay(AuthWay.PASSWORD)
+                .setRoles(roles)
+                .setResource(resource)
+                ;
+    }
+
+
+    @Override
+    protected void afterCheck(LoginForm loginForm, UserDetail userDetail) throws UserLoginException {
+        String secret = userDetail.getSecret();
+        PasswordLoginForm passwordLoginForm = (PasswordLoginForm) loginForm;
+        Assert.isTrue(EncryptUtil.matches(passwordLoginForm.getSecret(), secret), () -> new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "账号或密码错误"));
+    }
+
+    /**
+     * 获取登录表单类型
+     *
+     * @return 登录表单类型
+     * @see PasswordLoginForm
+     */
+    @Override
+    protected Class getLoginFormClazz() {
+        return PasswordLoginForm.class;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginForm.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginForm.java
new file mode 100644
index 0000000..d95ee0a
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginForm.java
@@ -0,0 +1,42 @@
+package com.njzscloud.common.security.module.password;
+
+import com.njzscloud.common.security.contant.AuthWay;
+import com.njzscloud.common.security.support.LoginForm;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 登录参数
+ */
+@Getter
+@Setter
+public class PasswordLoginForm extends LoginForm {
+    /**
+     * 登录账号
+     */
+    private String account;
+
+    /**
+     * 登录密码
+     */
+    private String secret;
+
+    /**
+     * 验证码
+     */
+    private String captcha;
+
+    /**
+     * 获取验证码时使用的 uid
+     */
+    private String captchaId;
+
+    public PasswordLoginForm() {
+        super(AuthWay.PASSWORD);
+    }
+
+    @Override
+    public String getName() {
+        return account;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginPreparer.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginPreparer.java
new file mode 100644
index 0000000..98c275f
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/module/password/PasswordLoginPreparer.java
@@ -0,0 +1,45 @@
+package com.njzscloud.common.security.module.password;
+
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.security.ex.UserLoginException;
+import com.njzscloud.common.security.support.LoginForm;
+import com.njzscloud.common.security.support.LoginPreparer;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 账号密码登录，登录参数处理器
+ */
+public class PasswordLoginPreparer implements LoginPreparer {
+    private static final AntPathRequestMatcher matcher = new AntPathRequestMatcher("/login", "POST");
+
+    /**
+     * 创建登录参数
+     *
+     * @param request 请求信息
+     * @return 登录参数 {@link PasswordLoginForm}
+     */
+    @Override
+    public LoginForm createLoginForm(HttpServletRequest request) {
+        try (ServletInputStream inputStream = request.getInputStream()) {
+            return Jackson.toBean(inputStream, PasswordLoginForm.class);
+        } catch (Exception e) {
+            throw new UserLoginException(e, ExceptionMsg.SYS_ERR_MSG, "登录表单解析失败");
+        }
+    }
+
+    /**
+     * 是否支持当前登录方式
+     *
+     * @param request 请求信息
+     * @return 当请求方式为 POST 且路径为 /login 时返回 true
+     */
+    @Override
+    public boolean support(HttpServletRequest request) {
+        return matcher.matches(request);
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/DefaultPermissionManager.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/DefaultPermissionManager.java
new file mode 100644
index 0000000..3e493b3
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/DefaultPermissionManager.java
@@ -0,0 +1,24 @@
+package com.njzscloud.common.security.permission;
+
+import com.njzscloud.common.security.contant.EndpointAccessModel;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 默认权限管理器

+ * 所有接口都必须登录后才能访问
+ */
+public class DefaultPermissionManager extends PermissionManager {
+
+    private final List DEFAULT_ROLE_PERMISSIONS = Collections.singletonList(
+            new RolePermission()
+                    .setEndpoint("/**")
+                    .setAccessModel(EndpointAccessModel.LOGINED)
+    );
+
+    @Override
+    protected List load() {
+        return DEFAULT_ROLE_PERMISSIONS;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionManager.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionManager.java
new file mode 100644
index 0000000..8356c3b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionManager.java
@@ -0,0 +1,177 @@
+package com.njzscloud.common.security.permission;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.security.contant.Constants;
+import com.njzscloud.common.security.contant.EndpointAccessModel;
+import com.njzscloud.common.security.ex.ForbiddenAccessException;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
+
+/**
+ * 权限管理器
+ */
+@Slf4j
+public abstract class PermissionManager {
+
+    private static final ReentrantLock PERMISSION_CACHE_LOCK = new ReentrantLock();
+    /**
+     * 权限缓存，请求地址——角色编码
+     */
+    private Map> PERMISSION_CACHE;
+
+    private Set FORBIDDEN_CACHE;
+
+    /**
+     * 刷新本地权限缓存
+     */
+    public final void refresh() {
+        try {
+            if (log.isDebugEnabled()) log.debug("刷新本地权限缓存已清除");
+            PERMISSION_CACHE_LOCK.lock();
+            PERMISSION_CACHE = null;
+            FORBIDDEN_CACHE = null;
+            if (log.isDebugEnabled()) log.debug("本地权限缓存已清除");
+            this.load0();
+        } finally {
+            PERMISSION_CACHE_LOCK.unlock();
+        }
+    }
+
+    /**
+     * 初始化本地权限缓存
+     */
+    public final void init() {
+        if (log.isDebugEnabled()) log.debug("初始化本地权限缓存");
+        if (CollUtil.isEmpty(PERMISSION_CACHE)) {
+            try {
+                PERMISSION_CACHE_LOCK.lock();
+                if (CollUtil.isEmpty(PERMISSION_CACHE)) {
+                    this.load0();
+                    return;
+                }
+            } finally {
+                PERMISSION_CACHE_LOCK.unlock();
+            }
+        }
+        if (log.isDebugEnabled()) log.debug("已初始化无需操作");
+    }
+
+    /**
+     * 加载权限
+     */
+    private void load0() {
+        if (log.isDebugEnabled()) log.debug("开始加载权限");
+
+        List rolePermissions = load();
+
+        if (rolePermissions == null) rolePermissions = Collections.emptyList();
+
+        Map> permissionMap = new LinkedHashMap<>();
+
+        Set forbiddenSet = new HashSet<>();
+
+        for (RolePermission rolePermission : rolePermissions) {
+            String endpoint = rolePermission.getEndpoint();
+            String method = rolePermission.getMethod();
+            EndpointAccessModel accessModel = rolePermission.getAccessModel();
+
+            AntPathRequestMatcher pathRequestMatcher = new AntPathRequestMatcher(endpoint, method);
+            if (accessModel == EndpointAccessModel.FORBIDDEN) {
+                forbiddenSet.add(pathRequestMatcher);
+                continue;
+            }
+
+            Collection configAttributes = permissionMap.computeIfAbsent(pathRequestMatcher, it -> new HashSet<>());
+
+            if (accessModel == EndpointAccessModel.ANONYMOUS) {
+                configAttributes.add(new SecurityConfig(Constants.ROLE_ANONYMOUS));
+                configAttributes.add(new SecurityConfig(Constants.ROLE_AUTHENTICATED));
+            } else if (accessModel == EndpointAccessModel.LOGINED) {
+                configAttributes.add(new SecurityConfig(Constants.ROLE_AUTHENTICATED));
+            } else if (accessModel == EndpointAccessModel.AUTHENTICATED) {
+                String role = rolePermission.getRole();
+                if (StrUtil.isNotBlank(role)) configAttributes.add(new SecurityConfig(role));
+            }
+        }
+
+        FORBIDDEN_CACHE = forbiddenSet;
+        PERMISSION_CACHE = permissionMap;
+
+        if (log.isDebugEnabled()) {
+            log.debug("本地权限缓存已加载：\n{}", Jackson.toJsonStr(this.getAllRelation()));
+        }
+    }
+
+    /**
+     * 加载权限
+     *
+     * @return List<RolePermission>
+     */
+    abstract protected List load();
+
+    /**
+     * 获取当前请求所需要的角色
+     *
+     * @param request 请求对象
+     * @return Collection<ConfigAttribute>
+     */
+    public final Collection extractAuthorities(HttpServletRequest request) {
+        this.init();
+        if (FORBIDDEN_CACHE != null) {
+            for (AntPathRequestMatcher antPathRequestMatcher : FORBIDDEN_CACHE) {
+                if (antPathRequestMatcher.matches(request)) {
+                    throw new ForbiddenAccessException("当前服务已停止使用！");
+                }
+            }
+        }
+        if (PERMISSION_CACHE != null) {
+            for (Map.Entry> entry : PERMISSION_CACHE.entrySet()) {
+                if (entry.getKey().matches(request)) {
+                    return entry.getValue();
+                }
+            }
+        }
+        return CollUtil.empty(Set.class);
+    }
+
+    /**
+     * 获取所有角色
+     *
+     * @return 角色列表
+     */
+    public final Collection getAll() {
+        this.init();
+        Set allAttributes = new HashSet<>();
+        if (PERMISSION_CACHE != null) PERMISSION_CACHE.values().forEach(allAttributes::addAll);
+        return CollUtil.unmodifiable(allAttributes);
+    }
+
+    /**
+     * 获取权限的字符表示形式
+     *
+     * @return Map<String, Set<String>>
+     */
+    public synchronized final Map> getAllRelation() {
+        Map> map = new HashMap<>();
+        if (PERMISSION_CACHE != null) {
+            Set>> entries = PERMISSION_CACHE.entrySet();
+            for (Map.Entry> entry : entries) {
+                AntPathRequestMatcher key = entry.getKey();
+                Collection value = entry.getValue();
+                Set collect = value.stream().map(ConfigAttribute::getAttribute).collect(Collectors.toSet());
+                map.put(key.toString(), collect);
+            }
+        }
+        return MapUtil.unmodifiable(map);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionSecurityMetaDataSource.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionSecurityMetaDataSource.java
new file mode 100644
index 0000000..dece0ac
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionSecurityMetaDataSource.java
@@ -0,0 +1,48 @@
+package com.njzscloud.common.security.permission;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.security.ex.MissingPermissionException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.web.FilterInvocation;
+import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
+
+@Slf4j
+@RequiredArgsConstructor
+public class PermissionSecurityMetaDataSource implements FilterInvocationSecurityMetadataSource {
+
+    // org.springframework.security.config.annotation.web.configurers.UrlAuthorizationConfigurer
+    // org.springframework.security.access.vote.RoleVoter  PermissionAuthorizationConfigurer
+
+    private final PermissionManager permissionManager;
+    // private final boolean rejectPublicInvocations;
+
+
+    @Override
+    public Collection getAttributes(Object object) throws IllegalArgumentException {
+        HttpServletRequest request = ((FilterInvocation) object).getRequest();
+        Collection permission = permissionManager.extractAuthorities(request);
+        String requestURI = request.getRequestURI();
+        String method = request.getMethod();
+        String endpoint = method.toUpperCase() + " " + requestURI;
+
+        Assert.notEmpty(permission, () -> new MissingPermissionException(StrUtil.format("请求: 【{}】 未指定权限", endpoint)));
+        if (log.isDebugEnabled()) log.debug("允许访问接口：【{}】的角色：【{}】", endpoint, permission);
+        return permission;
+    }
+
+    @Override
+    public Collection getAllConfigAttributes() {
+        return permissionManager.getAll();
+    }
+
+    @Override
+    public boolean supports(Class clazz) {
+        return FilterInvocation.class.isAssignableFrom(clazz);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionVoter.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionVoter.java
new file mode 100644
index 0000000..34dd614
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/PermissionVoter.java
@@ -0,0 +1,43 @@
+package com.njzscloud.common.security.permission;
+
+import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.Collection;
+
+/**
+ * 投票器
+ */
+public class PermissionVoter implements AccessDecisionVoter {
+    @Override
+    public int vote(Authentication authentication, Object object, Collection attributes) {
+        if (authentication == null) {
+            return ACCESS_DENIED;
+        }
+        int result = ACCESS_ABSTAIN;
+        Collection authorities = authentication.getAuthorities();
+        for (ConfigAttribute attribute : attributes) {
+            if (this.supports(attribute)) {
+                result = ACCESS_DENIED;
+                for (GrantedAuthority authority : authorities) {
+                    if (attribute.getAttribute().equals(authority.getAuthority())) {
+                        return ACCESS_GRANTED;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public boolean supports(ConfigAttribute attribute) {
+        return attribute.getAttribute() != null;
+    }
+
+    @Override
+    public boolean supports(Class clazz) {
+        return true;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/RolePermission.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/RolePermission.java
new file mode 100644
index 0000000..7f003f2
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/permission/RolePermission.java
@@ -0,0 +1,35 @@
+package com.njzscloud.common.security.permission;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.njzscloud.common.security.contant.EndpointAccessModel;
+
+/**
+ * 角色权限信息
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class RolePermission {
+
+    /**
+     * 请求方法
+     */
+    private String method;
+
+    /**
+     * 端点地址
+     */
+    private String endpoint;
+
+    /**
+     * 接口访问模式
+     */
+    private EndpointAccessModel accessModel;
+
+    /**
+     * 角色编码
+     */
+    private String role;
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AbstractAuthenticationProvider.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AbstractAuthenticationProvider.java
new file mode 100644
index 0000000..c1fda6b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AbstractAuthenticationProvider.java
@@ -0,0 +1,135 @@
+package com.njzscloud.common.security.support;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.common.core.ex.ExceptionMsg;
+import com.njzscloud.common.security.contant.Constants;
+import com.njzscloud.common.security.ex.UserLoginException;
+import org.springframework.security.authentication.AccountStatusException;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.CredentialsContainer;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+
+import java.util.Set;
+
+/**
+ * 认证器
+ */
+public abstract class AbstractAuthenticationProvider implements AuthenticationProvider {
+
+    /**
+     * 是否支持当前登录信息
+     *
+     * @param authentication 认证信息类型（在 filter 中调用 authenticate 方法传入的待认证对象的类型）
+     * @return true-->支持
+     */
+    @Override
+    public final boolean supports(Class authentication) {
+        return UserAuthenticationToken.class.isAssignableFrom(authentication);
+    }
+
+    @Override
+    public final Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        UserAuthenticationToken userAuthenticationToken = (UserAuthenticationToken) authentication;
+
+        Object principal = userAuthenticationToken.getPrincipal();
+
+        if (!principal.getClass().isAssignableFrom(this.getLoginFormClazz())) return null;
+
+        LoginForm loginForm = (LoginForm) principal;
+
+        this.beforeCheck(loginForm);
+
+        UserDetail userDetail;
+        try {
+            userDetail = this.retrieveUser(loginForm);
+        } catch (AuthenticationException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new InternalAuthenticationServiceException("服务器异常，用户信息加载失败", e);
+        }
+
+        Assert.notNull(userDetail, () -> new UsernameNotFoundException("用户不存在"));
+
+        Set roles = userDetail.getRoles();
+        if (CollUtil.isEmpty(roles)) {
+            userDetail.setRoles(CollUtil.newHashSet(Constants.ROLE_ANONYMOUS, Constants.ROLE_AUTHENTICATED));
+        } else {
+            roles.add(Constants.ROLE_ANONYMOUS);
+            roles.add(Constants.ROLE_AUTHENTICATED);
+        }
+
+        this.afterCheck(loginForm, userDetail);
+
+        // 敏感信息擦除
+        if (loginForm instanceof CredentialsContainer) {
+            ((CredentialsContainer) loginForm).eraseCredentials();
+        }
+
+        this.lastCheck(loginForm, userDetail);
+        AuthenticationDetails details = (AuthenticationDetails) userAuthenticationToken.getDetails();
+        return this.createAuthentication(userDetail, details);
+    }
+
+    /**
+     * 创建已完成认证的认证对象
+     *
+     * @param userDetail 用户信息
+     * @param details    额外登录信息
+     * @return 已完成认证的认证对象 {@link UserAuthenticationToken}
+     */
+    private Authentication createAuthentication(UserDetail userDetail, AuthenticationDetails details) {
+        Token token = Token.create(userDetail.getUserId(), userDetail.getAccountId(), userDetail.getAuthWay());
+        userDetail.setToken(token);
+        return UserAuthenticationToken.create(userDetail, details);
+    }
+
+    /**
+     * 表单检查，在查询用户信息之前执行
+     *
+     * @param loginForm 登录表单
+     * @throws UserLoginException 表单校验失败是抛出
+     */
+    protected void beforeCheck(LoginForm loginForm) throws UserLoginException {
+    }
+
+    /**
+     * 用户信息检查（如：密码校验），在查询用户信息之后执行
+     *
+     * @param userDetail 用户信息
+     * @throws AccountStatusException 用户信息校验失败时抛出
+     */
+    protected void afterCheck(LoginForm loginForm, UserDetail userDetail) throws UserLoginException {
+    }
+
+    /**
+     * 最终检查，用于检查账号状态，如：是否锁定
+     *
+     * @param userDetail 用户信息
+     * @throws AccountStatusException 账号状态校验失败时抛出
+     */
+    protected void lastCheck(LoginForm loginForm, UserDetail userDetail) throws UserLoginException {
+        if (userDetail.getDisabled() == Boolean.TRUE) {
+            throw new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "用户已被禁用");
+        }
+    }
+
+    /**
+     * 加载用户信息
+     *
+     * @param loginForm 登录表单
+     * @return 用户信息
+     */
+    protected abstract UserDetail retrieveUser(LoginForm loginForm) throws UserLoginException;
+
+    /**
+     * 获取登录表单的类型
+     *
+     * @return {@link LoginForm} 的子类
+     */
+    protected abstract Class getLoginFormClazz();
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AuthenticationDetails.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AuthenticationDetails.java
new file mode 100644
index 0000000..9964a5c
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/AuthenticationDetails.java
@@ -0,0 +1,55 @@
+package com.njzscloud.common.security.support;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.security.authentication.AuthenticationDetailsSource;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 
用户认证详情

+ * 
获取用户 IP, Nginx 反向代理 $remote_addr X-Real-IP

+ * 
获取用户代理, Nginx 反向代理 $http_user_agent X-Real-UA

+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+public class AuthenticationDetails {
+
+    /**
+     * 从请求对象中获取额外登录信息, IP 或 用户代理
+     */
+    private static final AuthenticationDetailsSource AUTHENTICATION_DETAILS_SOURCE = AuthenticationDetails::new;
+
+
+    /**
+     * 用户 IP
+     */
+    private final String remoteAddress;
+
+    /**
+     * 用户 Http 代理
+     */
+    private final String userAgent;
+
+    public AuthenticationDetails(HttpServletRequest request) {
+        String x_real_ip = request.getHeader("X-Real-IP");
+        if (StrUtil.isBlank(x_real_ip)) {
+            this.remoteAddress = request.getRemoteAddr();
+        } else {
+            this.remoteAddress = x_real_ip;
+        }
+        String x_real_ua = request.getHeader("X-Real-UA");
+        if (StrUtil.isBlank(x_real_ua)) {
+            this.userAgent = request.getHeader("UserDetail-Agent");
+        } else {
+            this.userAgent = x_real_ua;
+        }
+    }
+
+    public static AuthenticationDetails create(HttpServletRequest request) {
+        return AUTHENTICATION_DETAILS_SOURCE.buildDetails(request);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationConfigurer.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationConfigurer.java
new file mode 100644
index 0000000..65839cc
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationConfigurer.java
@@ -0,0 +1,83 @@
+package com.njzscloud.common.security.support;
+
+import com.njzscloud.common.security.handler.LoginPostHandler;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.context.SecurityContextRepository;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * 配置器
+ */
+public class CombineAuthenticationConfigurer extends AbstractHttpConfigurer {
+
+    /**
+     * 登陆预处理器
+     */
+    private final Collection loginPreparers = new ArrayList<>();
+    /**
+     * 认证管理器
+     */
+    private AuthenticationManager authenticationManager;
+    /**
+     * 登陆后置处理器
+     */
+    private LoginPostHandler loginPostHandler;
+
+    @Override
+    public void configure(HttpSecurity builder) throws Exception {
+        SecurityContextRepository securityContextRepository = builder.getSharedObject(SecurityContextRepository.class);
+        CombineAuthenticationFilter filter = new CombineAuthenticationFilter(loginPreparers, authenticationManager, loginPostHandler, securityContextRepository);
+        builder.addFilterBefore(filter, UsernamePasswordAuthenticationFilter.class);
+    }
+
+    /**
+     * 添加登陆预处理器
+     *
+     * @param loginPreparer 登陆预处理器
+     * @return 配置器对象
+     */
+    public CombineAuthenticationConfigurer addLoginPreparer(LoginPreparer loginPreparer) {
+        loginPreparers.add(loginPreparer);
+        return this;
+    }
+
+    /**
+     * 添加登陆预处理器
+     *
+     * @param loginPreparers 登陆预处理器
+     * @return 配置器对象
+     */
+    public CombineAuthenticationConfigurer loginPreparers(Collection loginPreparers) {
+        this.loginPreparers.addAll(loginPreparers);
+        return this;
+    }
+
+    /**
+     * 设置认证管理器
+     *
+     * @param authenticationManager 认证管理器
+     * @return 配置器对象
+     * @see AbstractAuthenticationProvider
+     */
+    public CombineAuthenticationConfigurer authenticationManager(AuthenticationManager authenticationManager) {
+        this.authenticationManager = authenticationManager;
+        return this;
+    }
+
+    /**
+     * 设置登录历史记录器
+     *
+     * @param loginHistoryRecorder 登录历史记录器
+     * @return 配置器对象
+     * @see DefaultLoginHistoryRecorder
+     */
+    public CombineAuthenticationConfigurer loginHistoryRecorder(LoginHistoryRecorder loginHistoryRecorder) {
+        this.loginPostHandler = new LoginPostHandler(loginHistoryRecorder);
+        return this;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationFilter.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationFilter.java
new file mode 100644
index 0000000..9f3c960
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/CombineAuthenticationFilter.java
@@ -0,0 +1,143 @@
+package com.njzscloud.common.security.support;
+
+import com.njzscloud.common.security.handler.LoginPostHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.context.SecurityContextRepository;
+import org.springframework.web.filter.GenericFilterBean;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Optional;
+
+/**
+ * 认证过滤器
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class CombineAuthenticationFilter extends GenericFilterBean {
+    /**
+     * 支持的登录方式列表
+     */
+    private final Collection loginPreparers;
+
+    /**
+     * 认证管理器{@link AbstractAuthenticationProvider}
+     */
+    private final AuthenticationManager authenticationManager;
+
+    /**
+     * 登陆后置处理器
+     */
+    private final LoginPostHandler loginPostHandler;
+
+    /**
+     * TOKEN 存取器
+     */
+    private final SecurityContextRepository securityContextRepository;
+
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+        Optional loginPreparerOptional = loginPreparers.stream().filter(it -> it.support(request)).findFirst();
+
+        if (!loginPreparerOptional.isPresent()) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        LoginPreparer loginPreparer = loginPreparerOptional.get();
+
+        LoginForm loginForm;
+        try {
+            loginForm = loginPreparer.createLoginForm(request);
+        } catch (AuthenticationException failed) {
+            unsuccessfulAuthentication(request, response, failed);
+            return;
+        } catch (Exception e) {
+            unsuccessfulAuthentication(request, response, new InternalAuthenticationServiceException("登录表单解析失败", e));
+            return;
+        }
+
+        try {
+            Authentication authentication = createAuthenticationToken(request, loginForm);
+            // 开始认证
+            Authentication authenticationResult = authenticationManager.authenticate(authentication);
+            // 不为空 则认证成功
+            if (authenticationResult != null) {
+                successfulAuthentication(request, response, authenticationResult);
+            }
+        } catch (AuthenticationException failed) {
+            unsuccessfulAuthentication(request, response, failed);
+        }
+    }
+
+    /**
+     * 构建待认证对象
+     *
+     * @param request HTTP 请求对象
+     * @return Authentication 待认证对象
+     */
+    private Authentication createAuthenticationToken(HttpServletRequest request, LoginForm loginForm) {
+        // 额外登录信息
+        AuthenticationDetails details = AuthenticationDetails.create(request);
+
+        return UserAuthenticationToken.create(loginForm, details);
+    }
+
+
+    /**
+     * 登录成功
+     *
+     * @param request        HTTP 请求对象
+     * @param response       HTTP 响应对象
+     * @param authentication 已认证的认证对象
+     */
+    private void successfulAuthentication(HttpServletRequest request,
+                                          HttpServletResponse response,
+                                          Authentication authentication) throws IOException, ServletException {
+        // 保存认证结果
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authentication);
+        SecurityContextHolder.setContext(context);
+
+        securityContextRepository.saveContext(context, request, response);
+
+        loginPostHandler.recordLoginHistory(authentication);
+
+        loginPostHandler.onAuthenticationSuccess(request, response, authentication);
+
+    }
+
+    /**
+     * 登录失败
+     *
+     * @param request  HTTP 请求对象
+     * @param response HTTP 响应对象
+     * @param failed   异常对象
+     */
+    private void unsuccessfulAuthentication(HttpServletRequest request,
+                                            HttpServletResponse response,
+                                            AuthenticationException failed) throws IOException, ServletException {
+        // 清空认证信息
+        SecurityContextHolder.clearContext();
+
+        // 认证失败后的处理
+        loginPostHandler.onAuthenticationFailure(request, response, failed);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultAuthenticationProvider.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultAuthenticationProvider.java
new file mode 100644
index 0000000..439cb97
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultAuthenticationProvider.java
@@ -0,0 +1,21 @@
+package com.njzscloud.common.security.support;
+
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+
+/**
+ * 认证器
+ */
+public class DefaultAuthenticationProvider implements AuthenticationProvider {
+
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        return null;
+    }
+
+    @Override
+    public boolean supports(Class authentication) {
+        return false;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultLoginHistoryRecorder.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultLoginHistoryRecorder.java
new file mode 100644
index 0000000..34f768a
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/DefaultLoginHistoryRecorder.java
@@ -0,0 +1,16 @@
+package com.njzscloud.common.security.support;
+
+
+import com.njzscloud.common.core.jackson.Jackson;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 默认登录历史记录器
+ */
+@Slf4j
+public class DefaultLoginHistoryRecorder implements LoginHistoryRecorder {
+    @Override
+    public void record(LoginHistory loginHistory) {
+        log.info("登陆成功：【{}】", Jackson.toJsonStr(loginHistory));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/EndpointResource.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/EndpointResource.java
new file mode 100644
index 0000000..d7793fb
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/EndpointResource.java
@@ -0,0 +1,47 @@
+package com.njzscloud.common.security.support;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 端点信息表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class EndpointResource {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 请求方式; 字典代码：request_method
+     */
+    private String requestMethod;
+
+    /**
+     * 路由前缀; 以 / 开头 或 为空
+     */
+    private String routingPath;
+
+    /**
+     * 端点地址; 以 / 开头, Ant 匹配模式
+     */
+    private String endpointPath;
+
+    /**
+     * 接口访问模式; 字典代码：endpoint_access_model
+     */
+    private String accessModel;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IResourceService.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IResourceService.java
new file mode 100644
index 0000000..e5252ae
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IResourceService.java
@@ -0,0 +1,6 @@
+package com.njzscloud.common.security.support;
+
+
+public interface IResourceService {
+    Resource selectResourceByUserId(Long userId);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IRoleService.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IRoleService.java
new file mode 100644
index 0000000..e23187d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IRoleService.java
@@ -0,0 +1,8 @@
+package com.njzscloud.common.security.support;
+
+
+import java.util.Set;
+
+public interface IRoleService {
+    Set selectRoleByUserId(Long userId);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/ITokenService.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/ITokenService.java
new file mode 100644
index 0000000..3cf049d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/ITokenService.java
@@ -0,0 +1,12 @@
+package com.njzscloud.common.security.support;
+
+public interface ITokenService {
+
+    void saveToken(UserDetail userDetail);
+
+    UserDetail loadUser(String tokenStr);
+
+    void removeToken(Token token);
+
+    void removeToken(Long userId);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java
new file mode 100644
index 0000000..c77c487
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/IUserService.java
@@ -0,0 +1,5 @@
+package com.njzscloud.common.security.support;
+
+public interface IUserService {
+    UserDetail selectUserByAccount(String account);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java
new file mode 100644
index 0000000..ea6d929
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginForm.java
@@ -0,0 +1,20 @@
+package com.njzscloud.common.security.support;
+
+
+import com.njzscloud.common.security.contant.AuthWay;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.security.Principal;
+
+@Getter
+@Setter
+@RequiredArgsConstructor
+public abstract class LoginForm implements Principal {
+    /**
+     * 登录方式
+     */
+    private final AuthWay authWay;
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistory.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistory.java
new file mode 100644
index 0000000..7d6c414
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistory.java
@@ -0,0 +1,66 @@
+package com.njzscloud.common.security.support;
+
+import com.njzscloud.common.security.contant.AuthWay;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 登录记录
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class LoginHistory {
+    /**
+     * 用户 Id
+     */
+    private Long userId;
+
+    /**
+     * 账号 Id
+     */
+    private Long accountId;
+
+    /**
+     * 登录时间
+     */
+    private LocalDateTime loginTime;
+
+    /**
+     * 认证方式
+     */
+    private AuthWay authWay;
+
+    /**
+     * 用户代理
+     */
+    private String userAgent;
+
+    /**
+     * 用户 IP
+     */
+    private String ip;
+
+    /**
+     * IP 归属地-省(代码)
+     */
+    private Integer provinceCode;
+
+    /**
+     * IP 归属地-省(名称)
+     */
+    private String provinceName;
+
+    /**
+     * IP 归属地-市(代码)
+     */
+    private Integer cityCode;
+
+    /**
+     * IP 归属地-市(名称)
+     */
+    private String cityName;
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistoryRecorder.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistoryRecorder.java
new file mode 100644
index 0000000..3c5313b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginHistoryRecorder.java
@@ -0,0 +1,9 @@
+package com.njzscloud.common.security.support;
+
+
+/**
+ * 登录历史记录器
+ */
+public interface LoginHistoryRecorder {
+    void record(LoginHistory loginHistory);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginPreparer.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginPreparer.java
new file mode 100644
index 0000000..3cb2fe7
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/LoginPreparer.java
@@ -0,0 +1,24 @@
+package com.njzscloud.common.security.support;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 登录前置处理器
+ */
+public interface LoginPreparer {
+    /**
+     * 是否处理当前请求
+     *
+     * @param request 请求对象
+     * @return true-->处理器可以处理当前请求
+     */
+    boolean support(HttpServletRequest request);
+
+    /**
+     * 创建登录表单
+     *
+     * @param request 请求对象
+     * @return 登录表单
+     */
+    LoginForm createLoginForm(HttpServletRequest request);
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/MenuResource.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/MenuResource.java
new file mode 100644
index 0000000..b663c4b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/MenuResource.java
@@ -0,0 +1,69 @@
+package com.njzscloud.common.security.support;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class MenuResource {
+    /**
+     * 编号
+     */
+    private String sn;
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 上级 Id; 层级为 1 的节点值为 0
+     */
+    private Long pid;
+
+    /**
+     * 菜单名称
+     */
+    private String title;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 层级
+     */
+    private Integer tier;
+
+    /**
+     * 面包路径; 逗号分隔
+     */
+    private List breadcrumb;
+
+    /**
+     * 类型; 字典代码：menu_category
+     */
+    private String menuCategory;
+
+    /**
+     * 标签是否冻结; 0-->否、1-->是
+     */
+    private Boolean freeze;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Resource.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Resource.java
new file mode 100644
index 0000000..5a3379d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Resource.java
@@ -0,0 +1,17 @@
+package com.njzscloud.common.security.support;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class Resource {
+    private List endpoint;
+    private List menu;
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Token.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Token.java
new file mode 100644
index 0000000..774da51
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/Token.java
@@ -0,0 +1,109 @@
+package com.njzscloud.common.security.support;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.njzscloud.common.core.fastjson.serializer.DictObjectDeserializer;
+import com.njzscloud.common.core.fastjson.serializer.DictObjectSerializer;
+import com.njzscloud.common.security.config.WebSecurityProperties;
+import com.njzscloud.common.security.contant.AuthWay;
+import com.njzscloud.common.security.contant.Constants;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+
+/**
+ * Token
+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+@RequiredArgsConstructor
+public final class Token {
+    /**
+     * 用户 Id
+     */
+    private final long userId;
+    /**
+     * 账号 Id
+     */
+    private final long accountId;
+    /**
+     * TOKEN Id
+     */
+    private final String tid;
+    /**
+     * 签发时间（时间戳）
+     */
+    private final long iat;
+    /**
+     * 过期时间（时间戳）
+     */
+    private final long exp;
+
+    /**
+     * 登录方式
+     */
+    @JSONField(serializeUsing = DictObjectSerializer.class, deserializeUsing = DictObjectDeserializer.class)
+    private final AuthWay authWay;
+
+    /**
+     * 创建 TOKEN
+     *
+     * @param userId    用户 Id
+     * @param accountId 账号 Id
+     * @param authWay   登陆方式
+     * @return Token 对象
+     */
+    public static Token create(long userId, long accountId, AuthWay authWay) {
+        WebSecurityProperties webSecurityProperties = SpringUtil.getBean(WebSecurityProperties.class);
+        long iat = System.currentTimeMillis();
+        String tid = IdUtil.fastSimpleUUID();
+        long tokenExp = webSecurityProperties.getTokenExp().getSeconds() * 1000;
+        long exp = tokenExp > 0 ? iat + tokenExp : 0;
+        return new Token(userId, accountId, tid, iat, exp, authWay);
+    }
+
+    /**
+     * 创建 TOKEN
+     *
+     * @param token 字符串形式的 TOKEN
+     * @return Token 对象
+     */
+    public static Token create(String token) {
+        token = Base64.decodeStr(token);
+        String[] tokenSection = token.split(Constants.TOKEN_STR_SEPARATOR);
+        long userId = Long.parseLong(tokenSection[0]);
+        long accountId = Long.parseLong(tokenSection[1]);
+        String tid = tokenSection[2];
+        long iat = Long.parseLong(tokenSection[3]);
+        long exp = Long.parseLong(tokenSection[4]);
+        AuthWay authWay = AuthWay.valueOf(tokenSection[5]);
+        return new Token(userId, accountId, tid, iat, exp, authWay);
+    }
+
+    /**
+     * 字符串输出
+     * 
由 6 段组成，每段逗号分隔，再取 Base64

+     * 
userId,accountId,tid,iat,exp,authWay（枚举名称）

+     */
+    @Override
+    public String toString() {
+        return Base64.encode(userId + Constants.TOKEN_STR_SEPARATOR +
+                accountId + Constants.TOKEN_STR_SEPARATOR +
+                tid + Constants.TOKEN_STR_SEPARATOR +
+                iat + Constants.TOKEN_STR_SEPARATOR +
+                exp + Constants.TOKEN_STR_SEPARATOR +
+                authWay);
+    }
+
+    /**
+     * 是否过期
+     */
+    public boolean isExpired() {
+        return exp > 0 && exp < System.currentTimeMillis() - 10 * 1000;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSecurityContextRepository.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSecurityContextRepository.java
new file mode 100644
index 0000000..6109d35
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSecurityContextRepository.java
@@ -0,0 +1,125 @@
+package com.njzscloud.common.security.support;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
+import com.njzscloud.common.core.jackson.Jackson;
+import com.njzscloud.common.security.contant.Constants;
+import com.njzscloud.common.security.util.SecurityUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.context.HttpRequestResponseHolder;
+import org.springframework.security.web.context.SecurityContextRepository;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * TOKEN 存取器
+ */
+@Slf4j
+public class TokenSecurityContextRepository implements SecurityContextRepository {
+
+    /**
+     * 请求头 TOKEN 匹配正则
+     */
+    private static final Pattern AUTHORIZATION_PATTERN = Pattern.compile("^(?[a-zA-Z0-9-.:_~+/]+=*)$", Pattern.CASE_INSENSITIVE);
+
+    /**
+     * Websocket TOKEN 所在的请求头
+     */
+    private static final String SEC_WEB_SOCKET_PROTOCOL = "Sec-WebSocket-Protocol";
+
+    /**
+     * 解析 TOKEN
+     *
+     * @param requestResponseHolder 请求信息存储器
+     * @return 认证信息
+     */
+    @Override
+    @SuppressWarnings("deprecation")
+    public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
+
+        HttpServletRequest request = requestResponseHolder.getRequest();
+        // 普通请求头中的 TOKEN
+        String authorization = request.getHeader(HttpHeaders.AUTHORIZATION);
+
+        // 从 Query 参数中获取 TOKEN
+        if (StrUtil.isBlank(authorization)) {
+            String queryString = request.getQueryString();
+            if (StrUtil.isNotBlank(queryString)) {
+                String[] split = queryString.split("&");
+                for (String s : split) {
+                    int idx = s.indexOf('=');
+                    String key = idx > 0 ? URLUtil.decode(s.substring(0, idx), "UTF-8") : s;
+                    if (HttpHeaders.AUTHORIZATION.equalsIgnoreCase(key)) {
+                        authorization = idx > 0 && s.length() > idx + 1 ? URLUtil.decode(s.substring(idx + 1), "UTF-8") : null;
+                    }
+                }
+            }
+        }
+
+        // 从 Websocket 子协议请求头中获取 TOKEN
+        if (StrUtil.isBlank(authorization)) {
+            String websocketHeader = request.getHeader(SEC_WEB_SOCKET_PROTOCOL);
+            if (StrUtil.isNotBlank(websocketHeader)) {
+                authorization = websocketHeader.split(",")[0].trim();
+            }
+        }
+
+        UserDetail userDetail = null;
+
+        if (StrUtil.isNotBlank(authorization)) {
+            authorization = URLUtil.decode(authorization);
+            Matcher matcher = AUTHORIZATION_PATTERN.matcher(authorization);
+            if (matcher.matches()) {
+                String tokenStr = matcher.group("token");
+                try {
+                    userDetail = SecurityUtil.parseToken(tokenStr);
+                } catch (Exception e) {
+                    log.warn("TOKEN 解析失败", e);
+                }
+            }
+        }
+
+        if (userDetail == null || userDetail.getToken().isExpired()) {
+            userDetail = Constants.ANONYMOUS_USER;
+        }
+
+        log.info("当前登录人信息：{}", Jackson.toJsonStr(userDetail));
+
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        AuthenticationDetails details = AuthenticationDetails.create(request);
+        context.setAuthentication(UserAuthenticationToken.create(userDetail, details));
+        return context;
+    }
+
+    /**
+     * 保存 TOKEN
+     *
+     * @param context  认证信息
+     * @param request  请求对象
+     * @param response 响应对象
+     */
+    @Override
+    public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) {
+        Authentication authentication = context.getAuthentication();
+        // 退出登录时会为 null
+        if (!request.getRequestURI().startsWith("/login") || authentication == null) return;
+        UserAuthenticationToken userAuthenticationToken = (UserAuthenticationToken) authentication;
+        UserDetail userDetail = (UserDetail) userAuthenticationToken.getPrincipal();
+        SecurityUtil.registrationToken(userDetail);
+    }
+
+    /**
+     * 始终为 true
+     */
+    @Override
+    public boolean containsContext(HttpServletRequest request) {
+        return true;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSerializer.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSerializer.java
new file mode 100644
index 0000000..888c560
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/TokenSerializer.java
@@ -0,0 +1,21 @@
+package com.njzscloud.common.security.support;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+
+/**
+ * TOKEN 序列化器
+ */
+public class TokenSerializer extends JsonSerializer {
+    @Override
+    public void serialize(Token value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value != null) {
+            gen.writeString(value.toString());
+        } else {
+            gen.writeNull();
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserAuthenticationToken.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserAuthenticationToken.java
new file mode 100644
index 0000000..433281d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserAuthenticationToken.java
@@ -0,0 +1,72 @@
+package com.njzscloud.common.security.support;
+
+import lombok.Getter;
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 待认证/已认证 令牌
+ */
+@Getter
+public class UserAuthenticationToken extends AbstractAuthenticationToken {
+
+    /**
+     * 凭证
+     */
+    private final Object credentials;
+
+    /**
+     * 认证主体，未认证时为：{@link LoginForm}，认证完成时为：{@link UserDetail}
+     */
+    private final Object principal;
+
+    /**
+     * 创建认证对象
+     *
+     * @param credentials   凭证
+     * @param principal     认证主体，未认证时为：{@link LoginForm}，认证完成时为：{@link UserDetail}
+     * @param authorities   权限信息（角色编码）
+     * @param details       登录附加信息{@link AuthenticationDetails}
+     * @param authenticated 是否已完成认证
+     */
+    private UserAuthenticationToken(Object credentials,
+                                    Object principal,
+                                    Collection authorities,
+                                    AuthenticationDetails details,
+                                    boolean authenticated) {
+        super(authorities);
+        setAuthenticated(authenticated);
+        setDetails(details);
+        this.credentials = credentials;
+        this.principal = principal;
+    }
+
+    /**
+     * 创建未认证的认证对象
+     *
+     * @param principal 认证主体，未认证时为：{@link LoginForm}
+     * @param details   登录附加信息{@link AuthenticationDetails}
+     * @return 待认证对象
+     */
+    public static UserAuthenticationToken create(LoginForm principal, AuthenticationDetails details) {
+        return new UserAuthenticationToken(null, principal, null, details, false);
+    }
+
+    /**
+     * 创建已完成认证的认证对象
+     *
+     * @param principal 用户信息{@link UserDetail}
+     * @return 已完成认证的认证对象
+     */
+    public static UserAuthenticationToken create(UserDetail principal, AuthenticationDetails details) {
+        Token credentials = principal.getToken();
+        Set roles = principal.getRoles();
+        Set authorities = roles.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toSet());
+        return new UserAuthenticationToken(credentials, principal, authorities, details, true);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserDetail.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserDetail.java
new file mode 100644
index 0000000..1fe48ba
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/support/UserDetail.java
@@ -0,0 +1,110 @@
+package com.njzscloud.common.security.support;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.njzscloud.common.core.fastjson.Fastjson;
+import com.njzscloud.common.core.fastjson.serializer.DictObjectDeserializer;
+import com.njzscloud.common.core.fastjson.serializer.DictObjectSerializer;
+import com.njzscloud.common.security.contant.AuthWay;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.springframework.security.core.CredentialsContainer;
+
+import java.security.Principal;
+import java.util.Set;
+
+/**
+ * 用户信息
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class UserDetail implements CredentialsContainer, Principal {
+
+    /**
+     * 用户 Id
+     */
+    private Long userId;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 密码
+     */
+    private String secret;
+
+    /**
+     * 账号 Id
+     */
+    private Long accountId;
+
+    private Long tenantId;
+
+    private String tenantName;
+    /**
+     * 业务对象
+     */
+    private String bizObj;
+
+    /**
+     * 登录方式
+     */
+    @JSONField(serializeUsing = DictObjectSerializer.class, deserializeUsing = DictObjectDeserializer.class)
+    private AuthWay authWay;
+
+    /**
+     * 角色编码
+     */
+    private Set roles;
+
+    /**
+     * 资源
+     */
+    private Resource resource;
+
+    @JsonSerialize(using = TokenSerializer.class)
+    private Token token;
+
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+
+    /**
+     * 账号是否过期
+     */
+    // private boolean accountExpired = false;
+
+    /**
+     * 账号是否被锁定
+     */
+    // private boolean accountLocked = false;
+
+    /**
+     * 密码是否过期
+     */
+    // private boolean credentialsExpired = false;
+
+    /**
+     * 是否启用
+     */
+    // private boolean disable = false;
+    @Override
+    public String toString() {
+        return Fastjson.toJsonStr(this);
+    }
+
+    @Override
+    public String getName() {
+        return userId.toString();
+    }
+
+    @Override
+    public void eraseCredentials() {
+        this.secret = null;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/EncryptUtil.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/EncryptUtil.java
new file mode 100644
index 0000000..97a9d5f
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/EncryptUtil.java
@@ -0,0 +1,64 @@
+package com.njzscloud.common.security.util;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.security.contant.Constants;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * 加密工具
+ */
+public class EncryptUtil {
+    /**
+     * 加密器
+     */
+    private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder();
+
+    /**
+     * 加密
+     *
+     * @param password 密码(明文)
+     * @return 密码(密文)
+     */
+    public static String encrypt(String password) {
+        if (StrUtil.isBlank(password)) return null;
+        return ENCODER.encode(password);
+    }
+
+    /**
+     * 匹配密码
+     *
+     * @param rawPassword     密码(明文)
+     * @param encodedPassword 密码(密文)
+     * @return 匹配结果, true: 成功
+     */
+    public static boolean matches(String rawPassword, String encodedPassword) {
+        return ENCODER.matches(rawPassword, encodedPassword);
+    }
+
+    /**
+     * 获取随机密码, 默认长度为 6
+     *
+     * @return String[ ] 0-->密码(原文), 1-->密码(密文)
+     */
+    public static String[] randomPassword() {
+        return randomPassword(6);
+    }
+
+    /**
+     * 获取随机密码
+     *
+     * @param len 密码长度
+     * @return String[ ] 0-->密码(原文), 1-->密码(密文)
+     */
+    public static String[] randomPassword(int len) {
+        String password = RandomUtil.randomString(Constants.RANDOM_BASE_STRING, len);
+        String encryptedPassword = encrypt(password);
+        return new String[]{password, encryptedPassword};
+    }
+
+    public static void main(String[] args) {
+        System.out.println(encrypt("admin"));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/SecurityUtil.java b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/SecurityUtil.java
new file mode 100644
index 0000000..81cff0a
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/java/com/njzscloud/common/security/util/SecurityUtil.java
@@ -0,0 +1,81 @@
+package com.njzscloud.common.security.util;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.njzscloud.common.security.contant.Constants;
+import com.njzscloud.common.security.support.ITokenService;
+import com.njzscloud.common.security.support.Token;
+import com.njzscloud.common.security.support.UserDetail;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * 获取认证信息工具
+ */
+public class SecurityUtil {
+    /**
+     * 获取当前登录主体信息
+     *
+     * @return UserAuthPrincipal
+     */
+    public static UserDetail loginUser() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        UserDetail userDetail = null;
+        if (authentication != null) userDetail = (UserDetail) authentication.getPrincipal();
+        return userDetail == null ? Constants.ANONYMOUS_USER : userDetail;
+    }
+
+    /**
+     * 是否是管理员
+     *
+     * @return true/false
+     */
+    public static boolean isAdmin() {
+        UserDetail userDetail = SecurityUtil.loginUser();
+        return userDetail.getRoles().contains(Constants.ROLE_ADMIN);
+    }
+
+    /**
+     * 获取当前登录用户 ID
+     *
+     * @return 用户 ID
+     */
+    public static Long currentUserId() {
+        UserDetail userDetail = SecurityUtil.loginUser();
+        return userDetail.getUserId();
+    }
+
+    /**
+     * 保存用户信息和 TOKEN
+     *
+     * @param userDetail 用户信息
+     */
+    public static void registrationToken(UserDetail userDetail) {
+        SpringUtil.getBean(ITokenService.class).saveToken(userDetail);
+    }
+
+    /**
+     * 解析 TOKEN
+     *
+     * @param tokenStr TOKEN 字符串
+     * @return Token
+     * @see Token
+     */
+    public static UserDetail parseToken(String tokenStr) {
+        return SpringUtil.getBean(ITokenService.class).loadUser(tokenStr);
+    }
+
+    /**
+     * 解析 TOKEN
+     *
+     * @param token TOKEN
+     * @see Token
+     */
+    public static void removeToken(Token token) {
+        SpringUtil.getBean(ITokenService.class).removeToken(token);
+    }
+
+
+    public static void removeToken(Long userId) {
+        SpringUtil.getBean(ITokenService.class).removeToken(userId);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-security/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-security/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..a331187
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-security/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
+  com.njzscloud.common.security.config.WebSecurityAutoConfiguration
diff --git a/njzscloud-common/njzscloud-common-sichen/pom.xml b/njzscloud-common/njzscloud-common-sichen/pom.xml
new file mode 100644
index 0000000..863375f
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/pom.xml
@@ -0,0 +1,38 @@
+
+    4.0.0
+    
+        com.njzscloud
+        njzscloud-common
+        0.0.1
+    
+
+    njzscloud-common-sichen
+    jar
+
+    sichen
+    http://maven.apache.org
+
+    
+        UTF-8
+    
+
+    
+        
+            com.njzscloud
+            njzscloud-common-core
+            provided
+        
+        
+            com.njzscloud
+            njzscloud-common-mp
+            provided
+        
+        
+        
+            org.junit.jupiter
+            junit-jupiter-engine
+            test
+        
+    
+
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskEntity.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskEntity.java
new file mode 100644
index 0000000..3067255
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskEntity.java
@@ -0,0 +1,65 @@
+package com.njzscloud.common.sichen;
+
+import com.njzscloud.common.sichen.contant.ScheduleType;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+ * 定时任务表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_task")
+public class SysTaskEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
+     * 任务执行函数
+     */
+    private String fn;
+
+    /**
+     * 调度方式; 字典代码：schedule_type
+     */
+    private ScheduleType scheduleType;
+
+    /**
+     * 调度配置; 手动时为空，固定周期时单位为秒
+     */
+    private String scheduleConf;
+
+    /**
+     * 临界时间
+     */
+    private Long criticalTiming;
+
+    /**
+     * 是否禁用; 0-->否、1-->是
+     */
+    private Boolean disabled;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskMapper.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskMapper.java
new file mode 100644
index 0000000..9e4dd0b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskMapper.java
@@ -0,0 +1,12 @@
+package com.njzscloud.common.sichen;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 定时任务表
+ */
+@Mapper
+public interface SysTaskMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskService.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskService.java
new file mode 100644
index 0000000..1ceb220
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/SysTaskService.java
@@ -0,0 +1,73 @@
+package com.njzscloud.common.sichen;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.sichen.support.TaskInfo;
+import com.njzscloud.common.sichen.support.TaskUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 定时任务表
+ */
+@Slf4j
+public class SysTaskService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysTaskEntity 数据
+     */
+    public void add(SysTaskEntity sysTaskEntity) {
+        TaskInfo taskInfo = BeanUtil.copyProperties(sysTaskEntity, TaskInfo.class)
+                .setCriticalTiming(TaskUtil.computedNextTiming(sysTaskEntity.getScheduleType(), sysTaskEntity.getScheduleConf()));
+        this.save(sysTaskEntity.setCriticalTiming(taskInfo.getCriticalTiming()));
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysTaskEntity 数据
+     */
+    public void modify(SysTaskEntity sysTaskEntity) {
+        this.updateById(sysTaskEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysTaskEntity 结果
+     */
+    public SysTaskEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysTaskEntity 筛选条件
+     * @param pageParam     分页参数
+     * @return PageResult<SysTaskEntity> 分页结果
+     */
+    public PageResult paging(PageParam pageParam, SysTaskEntity sysTaskEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysTaskEntity)));
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskAutoConfiguration.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskAutoConfiguration.java
new file mode 100644
index 0000000..4ddfbd2
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskAutoConfiguration.java
@@ -0,0 +1,50 @@
+package com.njzscloud.common.sichen.config;
+
+import com.njzscloud.common.core.thread.ThreadPool;
+import com.njzscloud.common.sichen.SysTaskService;
+import com.njzscloud.common.sichen.dispatcher.SichenScheduler;
+import com.njzscloud.common.sichen.executor.SichenExecutor;
+import com.njzscloud.common.sichen.support.TaskStore;
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+@MapperScan("com.njzscloud.common.sichen")
+@EnableConfigurationProperties(TaskProperties.class)
+public class TaskAutoConfiguration {
+
+    @Bean
+    public SysTaskService sysTaskService() {
+        return new SysTaskService();
+    }
+
+    @Bean
+    public TaskStore taskStore(SysTaskService sysTaskService) {
+        return new TaskStore(sysTaskService);
+    }
+
+    @Bean(destroyMethod = "stop")
+    public SichenExecutor sichenExecutor(TaskProperties taskProperties) {
+        TaskProperties.Pool pool = taskProperties.getPool();
+        return new SichenExecutor(ThreadPool.createThreadPool(
+                pool.getPoolName(),
+                pool.getCorePoolSize(),
+                pool.getMaxPoolSize(),
+                pool.getKeepAliveSeconds(),
+                pool.getWindowCapacity(),
+                pool.getStandbyCapacity(),
+                (r, p) -> log.error("任务执行器线程池已满，拒绝任务：{}", r.toString())
+        ));
+    }
+
+    @Bean(destroyMethod = "stop")
+    public SichenScheduler sichenScheduler(TaskStore taskStore) {
+        return new SichenScheduler(taskStore);
+    }
+
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskProperties.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskProperties.java
new file mode 100644
index 0000000..5f7eff3
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/config/TaskProperties.java
@@ -0,0 +1,27 @@
+package com.njzscloud.common.sichen.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@Setter
+@ToString
+@ConfigurationProperties(prefix = "task")
+public class TaskProperties {
+
+    private Pool pool = new Pool();
+
+    @Getter
+    @Setter
+    @ToString
+    public static class Pool {
+        private String poolName = "任务执行器";
+        private int corePoolSize = 10;
+        private int maxPoolSize = 200;
+        private long keepAliveSeconds = 300;
+        private int windowCapacity = 20;
+        private int standbyCapacity = 8192;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/ScheduleType.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/ScheduleType.java
new file mode 100644
index 0000000..3e9d462
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/ScheduleType.java
@@ -0,0 +1,17 @@
+package com.njzscloud.common.sichen.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum ScheduleType implements DictStr {
+    Manually("Manually", "手动"),
+    Fixed("Fixed", "固定周期"),
+    Cron("Cron", "自定义");
+
+    private final String val;
+
+    private final String txt;
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/TaskStatus.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/TaskStatus.java
new file mode 100644
index 0000000..f7f690e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/contant/TaskStatus.java
@@ -0,0 +1,20 @@
+package com.njzscloud.common.sichen.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum TaskStatus implements DictStr {
+    Waiting("Waiting", "等待调度"),
+    Pending("Pending", "排队中"),
+    Running("Running", "运行中"),
+    Completed("Completed", "已完成"),
+    Error("Error", "错误");
+
+    private final String val;
+
+    private final String txt;
+}
+
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/dispatcher/SichenScheduler.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/dispatcher/SichenScheduler.java
new file mode 100644
index 0000000..3542608
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/dispatcher/SichenScheduler.java
@@ -0,0 +1,130 @@
+package com.njzscloud.common.sichen.dispatcher;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.njzscloud.common.sichen.support.TaskHandle;
+import com.njzscloud.common.sichen.support.TaskInfo;
+import com.njzscloud.common.sichen.support.TaskUtil;
+import com.njzscloud.common.sichen.support.Cable;
+import com.njzscloud.common.sichen.support.TaskStore;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+public class SichenScheduler {
+
+    private static final int SCAN_TASK_PERIOD = 5000;
+    private final Map> todolist = new ConcurrentHashMap<>();
+    private final TaskStore taskStore;
+    private final Thread scanThread;
+    private final Thread dripThread;
+
+    public SichenScheduler(TaskStore taskStore) {
+        log.info("任务调度器启动中...");
+        this.taskStore = taskStore;
+        scanThread = new Thread(this::scanTask);
+        scanThread.setName("任务扫描线程");
+        scanThread.start();
+        dripThread = new Thread(this::drip);
+        dripThread.setName("计时器线程");
+        dripThread.start();
+        log.info("任务调度器已启动");
+    }
+
+    public void stop() {
+        log.info("正在停止任务调度器...");
+        ThreadUtil.interrupt(scanThread, true);
+        ThreadUtil.interrupt(dripThread, true);
+        log.info("任务调度器已停止");
+    }
+
+    private void scanTask() {
+        long cost = 0;
+        while (true) {
+            if (cost < SCAN_TASK_PERIOD) {
+                try {
+                    TimeUnit.MILLISECONDS.sleep(SCAN_TASK_PERIOD - System.currentTimeMillis() % 1000);
+                } catch (InterruptedException e) {
+                    log.info("任务扫描线程被中断");
+                    return;
+                }
+            }
+            long now = System.currentTimeMillis();
+            long soon = now + SCAN_TASK_PERIOD;
+
+            try {
+                List taskInfos = taskStore.load(now / 1000, soon / 1000);
+                if (taskInfos != null && !taskInfos.isEmpty()) {
+                    schedule(now / 1000, soon / 1000, taskInfos);
+                }
+            } catch (Exception e) {
+                log.error("任务调度失败", e);
+            }
+
+            cost = System.currentTimeMillis() - now;
+        }
+    }
+
+    private void schedule(long now, long soon, List taskInfos) {
+        try {
+            List updateList = new LinkedList<>();
+            for (TaskInfo taskInfo : taskInfos) {
+                try {
+                    long timing = taskInfo.getCriticalTiming();
+                    if (timing == now) {
+                        Cable.execute(new TaskHandle(taskInfo));
+                    } else if (timing > now) {
+                        List tasks = todolist.computeIfAbsent(timing % 60, k -> new LinkedList<>());
+                        tasks.add(new TaskHandle(taskInfo));
+                    }
+                    long criticalTiming = timing;
+                    for (int i = 0; ; i++) {
+                        timing = TaskUtil.computedNextTiming(now + i, taskInfo);
+                        if (timing != 0 && timing > now && timing < soon) {
+                            if (criticalTiming == timing) {
+                                continue;
+                            }
+                            List tasks = todolist.computeIfAbsent(timing % 60, k -> new LinkedList<>());
+                            tasks.add(new TaskHandle(taskInfo));
+                            criticalTiming = timing;
+                        } else {
+                            criticalTiming = timing;
+                            break;
+                        }
+                    }
+                    updateList.add(new TaskInfo(taskInfo).setCriticalTiming(criticalTiming));
+                } catch (Exception e) {
+                    log.error("任务调度失败", e);
+                }
+            }
+            taskStore.update(updateList);
+        } catch (Exception e) {
+            log.error("任务调度失败", e);
+        }
+    }
+
+    private void drip() {
+        while (true) {
+            try {
+                TimeUnit.MILLISECONDS.sleep(1000 - System.currentTimeMillis() % 1000);
+            } catch (InterruptedException e) {
+                log.info("计时器线程被中断");
+                return;
+            }
+
+            long now = System.currentTimeMillis() / 1000;
+
+            for (int i = 0; i < 2; i++) {
+                List tasks = todolist.remove(now % 60 + i);
+                if (tasks == null || tasks.isEmpty()) {
+                    continue;
+                }
+                Cable.execute(tasks);
+            }
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/executor/SichenExecutor.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/executor/SichenExecutor.java
new file mode 100644
index 0000000..2f8ab5e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/executor/SichenExecutor.java
@@ -0,0 +1,43 @@
+package com.njzscloud.common.sichen.executor;
+
+import com.njzscloud.common.core.thread.ThreadPool;
+import com.njzscloud.common.sichen.support.TaskHandle;
+import com.njzscloud.common.sichen.contant.TaskStatus;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Slf4j
+public class SichenExecutor {
+
+    private final ThreadPoolExecutor taskThreadPool;
+
+    public SichenExecutor(ThreadPoolExecutor taskThreadPool) {
+        log.info("任务执行器启动中...");
+        this.taskThreadPool = taskThreadPool;
+        log.info("任务执行器已启动");
+    }
+
+    public SichenExecutor() {
+        this(ThreadPool.createThreadPool("任务执行器",
+                10, 200,
+                300,
+                20, 8192,
+                (r, p) -> log.error("任务执行器线程池已满，拒绝任务：{}", r.toString())));
+    }
+
+    public void execute(TaskHandle taskHandle) {
+        if (taskHandle.getStatus() != TaskStatus.Waiting) {
+            return;
+        }
+        taskHandle.setStatus(TaskStatus.Pending);
+        taskThreadPool.execute(taskHandle);
+    }
+
+    public void stop() {
+        log.info("正在停止任务执行器...");
+        taskThreadPool.shutdownNow();
+        log.info("任务执行器已停止");
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Cable.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Cable.java
new file mode 100644
index 0000000..585e8ec
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Cable.java
@@ -0,0 +1,46 @@
+package com.njzscloud.common.sichen.support;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.sichen.dispatcher.SichenScheduler;
+import com.njzscloud.common.sichen.executor.SichenExecutor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+@Slf4j
+public class Cable {
+    private final static SichenScheduler SICHEN_SCHEDULER = SpringUtil.getBean(SichenScheduler.class);
+    private final static SichenExecutor SICHEN_EXECUTOR = SpringUtil.getBean(SichenExecutor.class);
+    private final static TaskStore taskStore = SpringUtil.getBean(TaskStore.class);
+
+    public static Tuple2 getFn(String fn) {
+        return taskStore.getFn(fn);
+    }
+
+    public static void execute(TaskHandle taskHandle) {
+        try {
+            SICHEN_EXECUTOR.execute(taskHandle);
+        } catch (Exception e) {
+            log.error("任务添加失败", e);
+        }
+    }
+
+    public static void execute(List tasks) {
+        if (tasks == null || tasks.isEmpty()) {
+            return;
+        }
+        for (TaskHandle taskHandle : tasks) {
+            try {
+                SICHEN_EXECUTOR.execute(taskHandle);
+            } catch (Exception e) {
+                log.error("任务添加失败", e);
+            }
+        }
+    }
+
+    public static void report(TaskHandle taskHandle) {
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/CronExpression.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/CronExpression.java
new file mode 100644
index 0000000..f1ede40
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/CronExpression.java
@@ -0,0 +1,1670 @@
+/*
+ * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package com.njzscloud.common.sichen.support;
+
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.*;
+
+/**
+ * Provides a parser and evaluator for unix-like cron expressions. Cron
+ * expressions provide the ability to specify complex time combinations such as
+ * "At 8:00am every Monday through Friday" or "At 1:30am every
+ * last Friday of the month".
+ * 

+ * Cron expressions are comprised of 6 required fields and one optional field
+ * separated by white space. The fields respectively are described as follows:
+ *
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
Field Name Allowed Values Allowed Special Characters
Seconds 
+ * 0-59 
+ * , - * /
Minutes 
+ * 0-59 
+ * , - * /
Hours 
+ * 0-23 
+ * , - * /
Day-of-month 
+ * 1-31 
+ * , - * ? / L W
Month 
+ * 0-11 or JAN-DEC 
+ * , - * /
Day-of-Week 
+ * 1-7 or SUN-SAT 
+ * , - * ? / L #
Year (Optional) 
+ * empty, 1970-2199 
+ * , - * /

+ * 

+ * The '*' character is used to specify all values. For example, "*"
+ * in the minute field means "every minute".
+ * 

+ * The '?' character is allowed for the day-of-month and day-of-week fields. It
+ * is used to specify 'no specific value'. This is useful when you need to
+ * specify something in one of the two fields, but not the other.
+ * 

+ * The '-' character is used to specify ranges For example "10-12" in
+ * the hour field means "the hours 10, 11 and 12".
+ * 

+ * The ',' character is used to specify additional values. For example
+ * "MON,WED,FRI" in the day-of-week field means "the days Monday,
+ * Wednesday, and Friday".
+ * 

+ * The '/' character is used to specify increments. For example "0/15"
+ * in the seconds field means "the seconds 0, 15, 30, and 45". And
+ * "5/15" in the seconds field means "the seconds 5, 20, 35, and
+ * 50".  Specifying '*' before the  '/' is equivalent to specifying 0 is
+ * the value to start with. Essentially, for each field in the expression, there
+ * is a set of numbers that can be turned on or off. For seconds and minutes,
+ * the numbers range from 0 to 59. For hours 0 to 23, for days of the month 0 to
+ * 31, and for months 0 to 11 (JAN to DEC). The "/" character simply helps you turn
+ * on every "nth" value in the given set. Thus "7/6" in the
+ * month field only turns on month "7", it does NOT mean every 6th
+ * month, please note that subtlety.
+ * 

+ * The 'L' character is allowed for the day-of-month and day-of-week fields.
+ * This character is short-hand for "last", but it has different
+ * meaning in each of the two fields. For example, the value "L" in
+ * the day-of-month field means "the last day of the month" - day 31
+ * for January, day 28 for February on non-leap years. If used in the
+ * day-of-week field by itself, it simply means "7" or
+ * "SAT". But if used in the day-of-week field after another value, it
+ * means "the last xxx day of the month" - for example "6L"
+ * means "the last friday of the month". You can also specify an offset
+ * from the last day of the month, such as "L-3" which would mean the third-to-last
+ * day of the calendar month. When using the 'L' option, it is important not to
+ * specify lists, or ranges of values, as you'll get confusing/unexpected results.
+ * 

+ * The 'W' character is allowed for the day-of-month field.  This character
+ * is used to specify the weekday (Monday-Friday) nearest the given day.  As an
+ * example, if you were to specify "15W" as the value for the
+ * day-of-month field, the meaning is: "the nearest weekday to the 15th of
+ * the month". So if the 15th is a Saturday, the trigger will fire on
+ * Friday the 14th. If the 15th is a Sunday, the trigger will fire on Monday the
+ * 16th. If the 15th is a Tuesday, then it will fire on Tuesday the 15th.
+ * However if you specify "1W" as the value for day-of-month, and the
+ * 1st is a Saturday, the trigger will fire on Monday the 3rd, as it will not
+ * 'jump' over the boundary of a month's days.  The 'W' character can only be
+ * specified when the day-of-month is a single day, not a range or list of days.
+ * 

+ * The 'L' and 'W' characters can also be combined for the day-of-month
+ * expression to yield 'LW', which translates to "last weekday of the
+ * month".
+ * 

+ * The '#' character is allowed for the day-of-week field. This character is
+ * used to specify "the nth" XXX day of the month. For example, the
+ * value of "6#3" in the day-of-week field means the third Friday of
+ * the month (day 6 = Friday and "#3" = the 3rd one in the month).
+ * Other examples: "2#1" = the first Monday of the month and
+ * "4#5" = the fifth Wednesday of the month. Note that if you specify
+ * "#5" and there is not 5 of the given day-of-week in the month, then
+ * no firing will occur that month.  If the '#' character is used, there can
+ * only be one expression in the day-of-week field ("3#1,6#3" is
+ * not valid, since there are two expressions).
+ * 

+ * 
+ * 

+ * The legal characters and the names of months and days of the week are not
+ * case sensitive.
+ *
+ * 

+ * NOTES:
+ * 
    
+ * 
  • Support for specifying both a day-of-week and a day-of-month value is
+ * not complete (you'll need to use the '?' character in one of these fields).
+ * 
    • 
+ * 
  • Overflowing ranges is supported - that is, having a larger number on
+ * the left hand side than the right. You might do 22-2 to catch 10 o'clock
+ * at night until 2 o'clock in the morning, or you might have NOV-FEB. It is
+ * very important to note that overuse of overflowing ranges creates ranges
+ * that don't make sense and no effort has been made to determine which
+ * interpretation CronExpression chooses. An example would be
+ * "0 0 14-6 ? * FRI-MON". 
    • 
+ * 

+ * 

+ *
+ * @author Sharada Jambula, James House
+ * @author Contributions from Mads Henderson
+ * @author Refactoring from CronTrigger to CronExpression by Aaron Craven
+ * 

+ * Borrowed from quartz v2.3.1
+ */
+public final class CronExpression implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 12423409423L;
+
+    protected static final int SECOND = 0;
+    protected static final int MINUTE = 1;
+    protected static final int HOUR = 2;
+    protected static final int DAY_OF_MONTH = 3;
+    protected static final int MONTH = 4;
+    protected static final int DAY_OF_WEEK = 5;
+    protected static final int YEAR = 6;
+    protected static final int ALL_SPEC_INT = 99; // '*'
+    protected static final int NO_SPEC_INT = 98; // '?'
+    protected static final Integer ALL_SPEC = ALL_SPEC_INT;
+    protected static final Integer NO_SPEC = NO_SPEC_INT;
+
+    protected static final Map monthMap = new HashMap(20);
+    protected static final Map dayMap = new HashMap(60);
+
+    static {
+        monthMap.put("JAN", 0);
+        monthMap.put("FEB", 1);
+        monthMap.put("MAR", 2);
+        monthMap.put("APR", 3);
+        monthMap.put("MAY", 4);
+        monthMap.put("JUN", 5);
+        monthMap.put("JUL", 6);
+        monthMap.put("AUG", 7);
+        monthMap.put("SEP", 8);
+        monthMap.put("OCT", 9);
+        monthMap.put("NOV", 10);
+        monthMap.put("DEC", 11);
+
+        dayMap.put("SUN", 1);
+        dayMap.put("MON", 2);
+        dayMap.put("TUE", 3);
+        dayMap.put("WED", 4);
+        dayMap.put("THU", 5);
+        dayMap.put("FRI", 6);
+        dayMap.put("SAT", 7);
+    }
+
+    private final String cronExpression;
+    private TimeZone timeZone = null;
+    protected transient TreeSet seconds;
+    protected transient TreeSet minutes;
+    protected transient TreeSet hours;
+    protected transient TreeSet daysOfMonth;
+    protected transient TreeSet months;
+    protected transient TreeSet daysOfWeek;
+    protected transient TreeSet years;
+
+    protected transient boolean lastdayOfWeek = false;
+    protected transient int nthdayOfWeek = 0;
+    protected transient boolean lastdayOfMonth = false;
+    protected transient boolean nearestWeekday = false;
+    protected transient int lastdayOffset = 0;
+    protected transient boolean expressionParsed = false;
+
+    public static final int MAX_YEAR = Calendar.getInstance().get(Calendar.YEAR) + 100;
+
+    /**
+     * Constructs a new CronExpression based on the specified
+     * parameter.
+     *
+     * @param cronExpression String representation of the cron expression the
+     *                       new object should represent
+     * @throws ParseException if the string expression cannot be parsed into a valid
+     *                        CronExpression
+     */
+    public CronExpression(String cronExpression) throws ParseException {
+        if (cronExpression == null) {
+            throw new IllegalArgumentException("cronExpression cannot be null");
+        }
+
+        this.cronExpression = cronExpression.toUpperCase(Locale.US);
+
+        buildExpression(this.cronExpression);
+    }
+
+    /**
+     * Constructs a new {@code CronExpression} as a copy of an existing
+     * instance.
+     *
+     * @param expression The existing cron expression to be copied
+     */
+    public CronExpression(CronExpression expression) {
+        /*
+         * We don't call the other constructor here since we need to swallow the
+         * ParseException. We also elide some of the sanity checking as it is
+         * not logically trippable.
+         */
+        this.cronExpression = expression.getCronExpression();
+        try {
+            buildExpression(cronExpression);
+        } catch (ParseException ex) {
+            throw new AssertionError();
+        }
+        if (expression.getTimeZone() != null) {
+            setTimeZone((TimeZone) expression.getTimeZone().clone());
+        }
+    }
+
+    /**
+     * Indicates whether the given date satisfies the cron expression. Note that
+     * milliseconds are ignored, so two Dates falling on different milliseconds
+     * of the same second will always have the same result here.
+     *
+     * @param date the date to evaluate
+     * @return a boolean indicating whether the given date satisfies the cron
+     * expression
+     */
+    public boolean isSatisfiedBy(Date date) {
+        Calendar testDateCal = Calendar.getInstance(getTimeZone());
+        testDateCal.setTime(date);
+        testDateCal.set(Calendar.MILLISECOND, 0);
+        Date originalDate = testDateCal.getTime();
+
+        testDateCal.add(Calendar.SECOND, -1);
+
+        Date timeAfter = getTimeAfter(testDateCal.getTime());
+
+        return ((timeAfter != null) && (timeAfter.equals(originalDate)));
+    }
+
+    /**
+     * Returns the next date/time after the given date/time which
+     * satisfies the cron expression.
+     *
+     * @param date the date/time at which to begin the search for the next valid
+     *             date/time
+     * @return the next valid date/time
+     */
+    public Date getNextValidTimeAfter(Date date) {
+        return getTimeAfter(date);
+    }
+
+    /**
+     * Returns the next date/time after the given date/time which does
+     * not satisfy the expression
+     *
+     * @param date the date/time at which to begin the search for the next
+     *             invalid date/time
+     * @return the next valid date/time
+     */
+    public Date getNextInvalidTimeAfter(Date date) {
+        long difference = 1000;
+
+        // move back to the nearest second so differences will be accurate
+        Calendar adjustCal = Calendar.getInstance(getTimeZone());
+        adjustCal.setTime(date);
+        adjustCal.set(Calendar.MILLISECOND, 0);
+        Date lastDate = adjustCal.getTime();
+
+        Date newDate;
+
+        // FUTURE_TODO: (QUARTZ-481) IMPROVE THIS! The following is a BAD solution to this problem. Performance will be very bad here, depending on the cron expression. It is, however A solution.
+
+        // keep getting the next included time until it's farther than one second
+        // apart. At that point, lastDate is the last valid fire time. We return
+        // the second immediately following it.
+        while (difference == 1000) {
+            newDate = getTimeAfter(lastDate);
+            if (newDate == null)
+                break;
+
+            difference = newDate.getTime() - lastDate.getTime();
+
+            if (difference == 1000) {
+                lastDate = newDate;
+            }
+        }
+
+        return new Date(lastDate.getTime() + 1000);
+    }
+
+    /**
+     * Returns the time zone for which this CronExpression
+     * will be resolved.
+     */
+    public TimeZone getTimeZone() {
+        if (timeZone == null) {
+            timeZone = TimeZone.getDefault();
+        }
+
+        return timeZone;
+    }
+
+    /**
+     * Sets the time zone for which  this CronExpression
+     * will be resolved.
+     */
+    public void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
+
+    /**
+     * Returns the string representation of the CronExpression
+     *
+     * @return a string representation of the CronExpression
+     */
+    @Override
+    public String toString() {
+        return cronExpression;
+    }
+
+    /**
+     * Indicates whether the specified cron expression can be parsed into a
+     * valid cron expression
+     *
+     * @param cronExpression the expression to evaluate
+     * @return a boolean indicating whether the given expression is a valid cron
+     * expression
+     */
+    public static boolean isValidExpression(String cronExpression) {
+
+        try {
+            new CronExpression(cronExpression);
+        } catch (ParseException pe) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static void validateExpression(String cronExpression) throws ParseException {
+
+        new CronExpression(cronExpression);
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    // Expression Parsing Functions
+    //
+
+    /// /////////////////////////////////////////////////////////////////////////
+
+    protected void buildExpression(String expression) throws ParseException {
+        expressionParsed = true;
+
+        try {
+
+            if (seconds == null) {
+                seconds = new TreeSet();
+            }
+            if (minutes == null) {
+                minutes = new TreeSet();
+            }
+            if (hours == null) {
+                hours = new TreeSet();
+            }
+            if (daysOfMonth == null) {
+                daysOfMonth = new TreeSet();
+            }
+            if (months == null) {
+                months = new TreeSet();
+            }
+            if (daysOfWeek == null) {
+                daysOfWeek = new TreeSet();
+            }
+            if (years == null) {
+                years = new TreeSet();
+            }
+
+            int exprOn = SECOND;
+
+            StringTokenizer exprsTok = new StringTokenizer(expression, " \t",
+                    false);
+
+            while (exprsTok.hasMoreTokens() && exprOn <= YEAR) {
+                String expr = exprsTok.nextToken().trim();
+
+                // throw an exception if L is used with other days of the month
+                if (exprOn == DAY_OF_MONTH && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) {
+                    throw new ParseException("Support for specifying 'L' and 'LW' with other days of the month is not implemented", -1);
+                }
+                // throw an exception if L is used with other days of the week
+                if (exprOn == DAY_OF_WEEK && expr.indexOf('L') != -1 && expr.length() > 1 && expr.contains(",")) {
+                    throw new ParseException("Support for specifying 'L' with other days of the week is not implemented", -1);
+                }
+                if (exprOn == DAY_OF_WEEK && expr.indexOf('#') != -1 && expr.indexOf('#', expr.indexOf('#') + 1) != -1) {
+                    throw new ParseException("Support for specifying multiple \"nth\" days is not implemented.", -1);
+                }
+
+                StringTokenizer vTok = new StringTokenizer(expr, ",");
+                while (vTok.hasMoreTokens()) {
+                    String v = vTok.nextToken();
+                    storeExpressionVals(0, v, exprOn);
+                }
+
+                exprOn++;
+            }
+
+            if (exprOn <= DAY_OF_WEEK) {
+                throw new ParseException("Unexpected end of expression.",
+                        expression.length());
+            }
+
+            if (exprOn <= YEAR) {
+                storeExpressionVals(0, "*", YEAR);
+            }
+
+            TreeSet dow = getSet(DAY_OF_WEEK);
+            TreeSet dom = getSet(DAY_OF_MONTH);
+
+            // Copying the logic from the UnsupportedOperationException below
+            boolean dayOfMSpec = !dom.contains(NO_SPEC);
+            boolean dayOfWSpec = !dow.contains(NO_SPEC);
+
+            if (!dayOfMSpec || dayOfWSpec) {
+                if (!dayOfWSpec || dayOfMSpec) {
+                    throw new ParseException(
+                            "Support for specifying both a day-of-week AND a day-of-month parameter is not implemented.", 0);
+                }
+            }
+        } catch (ParseException pe) {
+            throw pe;
+        } catch (Exception e) {
+            throw new ParseException("Illegal cron expression format ("
+                    + e.toString() + ")", 0);
+        }
+    }
+
+    protected int storeExpressionVals(int pos, String s, int type)
+            throws ParseException {
+
+        int incr = 0;
+        int i = skipWhiteSpace(pos, s);
+        if (i >= s.length()) {
+            return i;
+        }
+        char c = s.charAt(i);
+        if ((c >= 'A') && (c <= 'Z') && (!s.equals("L")) && (!s.equals("LW")) && (!s.matches("^L-[0-9]*[W]?"))) {
+            String sub = s.substring(i, i + 3);
+            int sval = -1;
+            int eval = -1;
+            if (type == MONTH) {
+                sval = getMonthNumber(sub) + 1;
+                if (sval <= 0) {
+                    throw new ParseException("Invalid Month value: '" + sub + "'", i);
+                }
+                if (s.length() > i + 3) {
+                    c = s.charAt(i + 3);
+                    if (c == '-') {
+                        i += 4;
+                        sub = s.substring(i, i + 3);
+                        eval = getMonthNumber(sub) + 1;
+                        if (eval <= 0) {
+                            throw new ParseException("Invalid Month value: '" + sub + "'", i);
+                        }
+                    }
+                }
+            } else if (type == DAY_OF_WEEK) {
+                sval = getDayOfWeekNumber(sub);
+                if (sval < 0) {
+                    throw new ParseException("Invalid Day-of-Week value: '"
+                            + sub + "'", i);
+                }
+                if (s.length() > i + 3) {
+                    c = s.charAt(i + 3);
+                    if (c == '-') {
+                        i += 4;
+                        sub = s.substring(i, i + 3);
+                        eval = getDayOfWeekNumber(sub);
+                        if (eval < 0) {
+                            throw new ParseException(
+                                    "Invalid Day-of-Week value: '" + sub
+                                            + "'", i);
+                        }
+                    } else if (c == '#') {
+                        try {
+                            i += 4;
+                            nthdayOfWeek = Integer.parseInt(s.substring(i));
+                            if (nthdayOfWeek < 1 || nthdayOfWeek > 5) {
+                                throw new Exception();
+                            }
+                        } catch (Exception e) {
+                            throw new ParseException(
+                                    "A numeric value between 1 and 5 must follow the '#' option",
+                                    i);
+                        }
+                    } else if (c == 'L') {
+                        lastdayOfWeek = true;
+                        i++;
+                    }
+                }
+
+            } else {
+                throw new ParseException(
+                        "Illegal characters for this position: '" + sub + "'",
+                        i);
+            }
+            if (eval != -1) {
+                incr = 1;
+            }
+            addToSet(sval, eval, incr, type);
+            return (i + 3);
+        }
+
+        if (c == '?') {
+            i++;
+            if ((i + 1) < s.length()
+                    && (s.charAt(i) != ' ' && s.charAt(i + 1) != '\t')) {
+                throw new ParseException("Illegal character after '?': "
+                        + s.charAt(i), i);
+            }
+            if (type != DAY_OF_WEEK && type != DAY_OF_MONTH) {
+                throw new ParseException(
+                        "'?' can only be specified for Day-of-Month or Day-of-Week.",
+                        i);
+            }
+            if (type == DAY_OF_WEEK && !lastdayOfMonth) {
+                int val = daysOfMonth.last();
+                if (val == NO_SPEC_INT) {
+                    throw new ParseException(
+                            "'?' can only be specified for Day-of-Month -OR- Day-of-Week.",
+                            i);
+                }
+            }
+
+            addToSet(NO_SPEC_INT, -1, 0, type);
+            return i;
+        }
+
+        if (c == '*' || c == '/') {
+            if (c == '*' && (i + 1) >= s.length()) {
+                addToSet(ALL_SPEC_INT, -1, incr, type);
+                return i + 1;
+            } else if (c == '/'
+                    && ((i + 1) >= s.length() || s.charAt(i + 1) == ' ' || s
+                    .charAt(i + 1) == '\t')) {
+                throw new ParseException("'/' must be followed by an integer.", i);
+            } else if (c == '*') {
+                i++;
+            }
+            c = s.charAt(i);
+            if (c == '/') { // is an increment specified?
+                i++;
+                if (i >= s.length()) {
+                    throw new ParseException("Unexpected end of string.", i);
+                }
+
+                incr = getNumericValue(s, i);
+
+                i++;
+                if (incr > 10) {
+                    i++;
+                }
+                checkIncrementRange(incr, type, i);
+            } else {
+                incr = 1;
+            }
+
+            addToSet(ALL_SPEC_INT, -1, incr, type);
+            return i;
+        } else if (c == 'L') {
+            i++;
+            if (type == DAY_OF_MONTH) {
+                lastdayOfMonth = true;
+            }
+            if (type == DAY_OF_WEEK) {
+                addToSet(7, 7, 0, type);
+            }
+            if (type == DAY_OF_MONTH && s.length() > i) {
+                c = s.charAt(i);
+                if (c == '-') {
+                    ValueSet vs = getValue(0, s, i + 1);
+                    lastdayOffset = vs.value;
+                    if (lastdayOffset > 30)
+                        throw new ParseException("Offset from last day must be <= 30", i + 1);
+                    i = vs.pos;
+                }
+                if (s.length() > i) {
+                    c = s.charAt(i);
+                    if (c == 'W') {
+                        nearestWeekday = true;
+                        i++;
+                    }
+                }
+            }
+            return i;
+        } else if (c >= '0' && c <= '9') {
+            int val = Integer.parseInt(String.valueOf(c));
+            i++;
+            if (i >= s.length()) {
+                addToSet(val, -1, -1, type);
+            } else {
+                c = s.charAt(i);
+                if (c >= '0' && c <= '9') {
+                    ValueSet vs = getValue(val, s, i);
+                    val = vs.value;
+                    i = vs.pos;
+                }
+                i = checkNext(i, s, val, type);
+                return i;
+            }
+        } else {
+            throw new ParseException("Unexpected character: " + c, i);
+        }
+
+        return i;
+    }
+
+    private void checkIncrementRange(int incr, int type, int idxPos) throws ParseException {
+        if (incr > 59 && (type == SECOND || type == MINUTE)) {
+            throw new ParseException("Increment > 60 : " + incr, idxPos);
+        } else if (incr > 23 && (type == HOUR)) {
+            throw new ParseException("Increment > 24 : " + incr, idxPos);
+        } else if (incr > 31 && (type == DAY_OF_MONTH)) {
+            throw new ParseException("Increment > 31 : " + incr, idxPos);
+        } else if (incr > 7 && (type == DAY_OF_WEEK)) {
+            throw new ParseException("Increment > 7 : " + incr, idxPos);
+        } else if (incr > 12 && (type == MONTH)) {
+            throw new ParseException("Increment > 12 : " + incr, idxPos);
+        }
+    }
+
+    protected int checkNext(int pos, String s, int val, int type)
+            throws ParseException {
+
+        int end = -1;
+        int i = pos;
+
+        if (i >= s.length()) {
+            addToSet(val, end, -1, type);
+            return i;
+        }
+
+        char c = s.charAt(pos);
+
+        if (c == 'L') {
+            if (type == DAY_OF_WEEK) {
+                if (val < 1 || val > 7)
+                    throw new ParseException("Day-of-Week values must be between 1 and 7", -1);
+                lastdayOfWeek = true;
+            } else {
+                throw new ParseException("'L' option is not valid here. (pos=" + i + ")", i);
+            }
+            TreeSet set = getSet(type);
+            set.add(val);
+            i++;
+            return i;
+        }
+
+        if (c == 'W') {
+            if (type == DAY_OF_MONTH) {
+                nearestWeekday = true;
+            } else {
+                throw new ParseException("'W' option is not valid here. (pos=" + i + ")", i);
+            }
+            if (val > 31)
+                throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i);
+            TreeSet set = getSet(type);
+            set.add(val);
+            i++;
+            return i;
+        }
+
+        if (c == '#') {
+            if (type != DAY_OF_WEEK) {
+                throw new ParseException("'#' option is not valid here. (pos=" + i + ")", i);
+            }
+            i++;
+            try {
+                nthdayOfWeek = Integer.parseInt(s.substring(i));
+                if (nthdayOfWeek < 1 || nthdayOfWeek > 5) {
+                    throw new Exception();
+                }
+            } catch (Exception e) {
+                throw new ParseException(
+                        "A numeric value between 1 and 5 must follow the '#' option",
+                        i);
+            }
+
+            TreeSet set = getSet(type);
+            set.add(val);
+            i++;
+            return i;
+        }
+
+        if (c == '-') {
+            i++;
+            c = s.charAt(i);
+            int v = Integer.parseInt(String.valueOf(c));
+            end = v;
+            i++;
+            if (i >= s.length()) {
+                addToSet(val, end, 1, type);
+                return i;
+            }
+            c = s.charAt(i);
+            if (c >= '0' && c <= '9') {
+                ValueSet vs = getValue(v, s, i);
+                end = vs.value;
+                i = vs.pos;
+            }
+            if (i < s.length() && ((c = s.charAt(i)) == '/')) {
+                i++;
+                c = s.charAt(i);
+                int v2 = Integer.parseInt(String.valueOf(c));
+                i++;
+                if (i >= s.length()) {
+                    addToSet(val, end, v2, type);
+                    return i;
+                }
+                c = s.charAt(i);
+                if (c >= '0' && c <= '9') {
+                    ValueSet vs = getValue(v2, s, i);
+                    int v3 = vs.value;
+                    addToSet(val, end, v3, type);
+                    i = vs.pos;
+                    return i;
+                } else {
+                    addToSet(val, end, v2, type);
+                    return i;
+                }
+            } else {
+                addToSet(val, end, 1, type);
+                return i;
+            }
+        }
+
+        if (c == '/') {
+            if ((i + 1) >= s.length() || s.charAt(i + 1) == ' ' || s.charAt(i + 1) == '\t') {
+                throw new ParseException("'/' must be followed by an integer.", i);
+            }
+
+            i++;
+            c = s.charAt(i);
+            int v2 = Integer.parseInt(String.valueOf(c));
+            i++;
+            if (i >= s.length()) {
+                checkIncrementRange(v2, type, i);
+                addToSet(val, end, v2, type);
+                return i;
+            }
+            c = s.charAt(i);
+            if (c >= '0' && c <= '9') {
+                ValueSet vs = getValue(v2, s, i);
+                int v3 = vs.value;
+                checkIncrementRange(v3, type, i);
+                addToSet(val, end, v3, type);
+                i = vs.pos;
+                return i;
+            } else {
+                throw new ParseException("Unexpected character '" + c + "' after '/'", i);
+            }
+        }
+
+        addToSet(val, end, 0, type);
+        i++;
+        return i;
+    }
+
+    public String getCronExpression() {
+        return cronExpression;
+    }
+
+    public String getExpressionSummary() {
+        StringBuilder buf = new StringBuilder();
+
+        buf.append("seconds: ");
+        buf.append(getExpressionSetSummary(seconds));
+        buf.append("\n");
+        buf.append("minutes: ");
+        buf.append(getExpressionSetSummary(minutes));
+        buf.append("\n");
+        buf.append("hours: ");
+        buf.append(getExpressionSetSummary(hours));
+        buf.append("\n");
+        buf.append("daysOfMonth: ");
+        buf.append(getExpressionSetSummary(daysOfMonth));
+        buf.append("\n");
+        buf.append("months: ");
+        buf.append(getExpressionSetSummary(months));
+        buf.append("\n");
+        buf.append("daysOfWeek: ");
+        buf.append(getExpressionSetSummary(daysOfWeek));
+        buf.append("\n");
+        buf.append("lastdayOfWeek: ");
+        buf.append(lastdayOfWeek);
+        buf.append("\n");
+        buf.append("nearestWeekday: ");
+        buf.append(nearestWeekday);
+        buf.append("\n");
+        buf.append("NthDayOfWeek: ");
+        buf.append(nthdayOfWeek);
+        buf.append("\n");
+        buf.append("lastdayOfMonth: ");
+        buf.append(lastdayOfMonth);
+        buf.append("\n");
+        buf.append("years: ");
+        buf.append(getExpressionSetSummary(years));
+        buf.append("\n");
+
+        return buf.toString();
+    }
+
+    protected String getExpressionSetSummary(java.util.Set set) {
+
+        if (set.contains(NO_SPEC)) {
+            return "?";
+        }
+        if (set.contains(ALL_SPEC)) {
+            return "*";
+        }
+
+        StringBuilder buf = new StringBuilder();
+
+        Iterator itr = set.iterator();
+        boolean first = true;
+        while (itr.hasNext()) {
+            Integer iVal = itr.next();
+            String val = iVal.toString();
+            if (!first) {
+                buf.append(",");
+            }
+            buf.append(val);
+            first = false;
+        }
+
+        return buf.toString();
+    }
+
+    protected String getExpressionSetSummary(java.util.ArrayList list) {
+
+        if (list.contains(NO_SPEC)) {
+            return "?";
+        }
+        if (list.contains(ALL_SPEC)) {
+            return "*";
+        }
+
+        StringBuilder buf = new StringBuilder();
+
+        Iterator itr = list.iterator();
+        boolean first = true;
+        while (itr.hasNext()) {
+            Integer iVal = itr.next();
+            String val = iVal.toString();
+            if (!first) {
+                buf.append(",");
+            }
+            buf.append(val);
+            first = false;
+        }
+
+        return buf.toString();
+    }
+
+    protected int skipWhiteSpace(int i, String s) {
+        for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) {
+        }
+
+        return i;
+    }
+
+    protected int findNextWhiteSpace(int i, String s) {
+        for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) {
+        }
+
+        return i;
+    }
+
+    protected void addToSet(int val, int end, int incr, int type)
+            throws ParseException {
+
+        TreeSet set = getSet(type);
+
+        if (type == SECOND || type == MINUTE) {
+            if ((val < 0 || val > 59 || end > 59) && (val != ALL_SPEC_INT)) {
+                throw new ParseException(
+                        "Minute and Second values must be between 0 and 59",
+                        -1);
+            }
+        } else if (type == HOUR) {
+            if ((val < 0 || val > 23 || end > 23) && (val != ALL_SPEC_INT)) {
+                throw new ParseException(
+                        "Hour values must be between 0 and 23", -1);
+            }
+        } else if (type == DAY_OF_MONTH) {
+            if ((val < 1 || val > 31 || end > 31) && (val != ALL_SPEC_INT)
+                    && (val != NO_SPEC_INT)) {
+                throw new ParseException(
+                        "Day of month values must be between 1 and 31", -1);
+            }
+        } else if (type == MONTH) {
+            if ((val < 1 || val > 12 || end > 12) && (val != ALL_SPEC_INT)) {
+                throw new ParseException(
+                        "Month values must be between 1 and 12", -1);
+            }
+        } else if (type == DAY_OF_WEEK) {
+            if ((val == 0 || val > 7 || end > 7) && (val != ALL_SPEC_INT)
+                    && (val != NO_SPEC_INT)) {
+                throw new ParseException(
+                        "Day-of-Week values must be between 1 and 7", -1);
+            }
+        }
+
+        if ((incr == 0 || incr == -1) && val != ALL_SPEC_INT) {
+            if (val != -1) {
+                set.add(val);
+            } else {
+                set.add(NO_SPEC);
+            }
+
+            return;
+        }
+
+        int startAt = val;
+        int stopAt = end;
+
+        if (val == ALL_SPEC_INT && incr <= 0) {
+            incr = 1;
+            set.add(ALL_SPEC); // put in a marker, but also fill values
+        }
+
+        if (type == SECOND || type == MINUTE) {
+            if (stopAt == -1) {
+                stopAt = 59;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 0;
+            }
+        } else if (type == HOUR) {
+            if (stopAt == -1) {
+                stopAt = 23;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 0;
+            }
+        } else if (type == DAY_OF_MONTH) {
+            if (stopAt == -1) {
+                stopAt = 31;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 1;
+            }
+        } else if (type == MONTH) {
+            if (stopAt == -1) {
+                stopAt = 12;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 1;
+            }
+        } else if (type == DAY_OF_WEEK) {
+            if (stopAt == -1) {
+                stopAt = 7;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 1;
+            }
+        } else if (type == YEAR) {
+            if (stopAt == -1) {
+                stopAt = MAX_YEAR;
+            }
+            if (startAt == -1 || startAt == ALL_SPEC_INT) {
+                startAt = 1970;
+            }
+        }
+
+        // if the end of the range is before the start, then we need to overflow into
+        // the next day, month etc. This is done by adding the maximum amount for that
+        // type, and using modulus max to determine the value being added.
+        int max = -1;
+        if (stopAt < startAt) {
+            switch (type) {
+                case SECOND:
+                    max = 60;
+                    break;
+                case MINUTE:
+                    max = 60;
+                    break;
+                case HOUR:
+                    max = 24;
+                    break;
+                case MONTH:
+                    max = 12;
+                    break;
+                case DAY_OF_WEEK:
+                    max = 7;
+                    break;
+                case DAY_OF_MONTH:
+                    max = 31;
+                    break;
+                case YEAR:
+                    throw new IllegalArgumentException("Start year must be less than stop year");
+                default:
+                    throw new IllegalArgumentException("Unexpected type encountered");
+            }
+            stopAt += max;
+        }
+
+        for (int i = startAt; i <= stopAt; i += incr) {
+            if (max == -1) {
+                // ie: there's no max to overflow over
+                set.add(i);
+            } else {
+                // take the modulus to get the real value
+                int i2 = i % max;
+
+                // 1-indexed ranges should not include 0, and should include their max
+                if (i2 == 0 && (type == MONTH || type == DAY_OF_WEEK || type == DAY_OF_MONTH)) {
+                    i2 = max;
+                }
+
+                set.add(i2);
+            }
+        }
+    }
+
+    TreeSet getSet(int type) {
+        switch (type) {
+            case SECOND:
+                return seconds;
+            case MINUTE:
+                return minutes;
+            case HOUR:
+                return hours;
+            case DAY_OF_MONTH:
+                return daysOfMonth;
+            case MONTH:
+                return months;
+            case DAY_OF_WEEK:
+                return daysOfWeek;
+            case YEAR:
+                return years;
+            default:
+                return null;
+        }
+    }
+
+    protected ValueSet getValue(int v, String s, int i) {
+        char c = s.charAt(i);
+        StringBuilder s1 = new StringBuilder(String.valueOf(v));
+        while (c >= '0' && c <= '9') {
+            s1.append(c);
+            i++;
+            if (i >= s.length()) {
+                break;
+            }
+            c = s.charAt(i);
+        }
+        ValueSet val = new ValueSet();
+
+        val.pos = (i < s.length()) ? i : i + 1;
+        val.value = Integer.parseInt(s1.toString());
+        return val;
+    }
+
+    protected int getNumericValue(String s, int i) {
+        int endOfVal = findNextWhiteSpace(i, s);
+        String val = s.substring(i, endOfVal);
+        return Integer.parseInt(val);
+    }
+
+    protected int getMonthNumber(String s) {
+        Integer integer = monthMap.get(s);
+
+        if (integer == null) {
+            return -1;
+        }
+
+        return integer;
+    }
+
+    protected int getDayOfWeekNumber(String s) {
+        Integer integer = dayMap.get(s);
+
+        if (integer == null) {
+            return -1;
+        }
+
+        return integer;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    // Computation Functions
+    //
+
+    /// /////////////////////////////////////////////////////////////////////////
+
+    public Date getTimeAfter(Date afterTime) {
+
+        // Computation is based on Gregorian year only.
+        Calendar cl = new java.util.GregorianCalendar(getTimeZone());
+
+        // move ahead one second, since we're computing the time *after* the
+        // given time
+        afterTime = new Date(afterTime.getTime() + 1000);
+        // CronTrigger does not deal with milliseconds
+        cl.setTime(afterTime);
+        cl.set(Calendar.MILLISECOND, 0);
+
+        boolean gotOne = false;
+        // loop until we've computed the next time, or we've past the endTime
+        while (!gotOne) {
+
+            // if (endTime != null && cl.getTime().after(endTime)) return null;
+            if (cl.get(Calendar.YEAR) > 2999) { // prevent endless loop...
+                return null;
+            }
+
+            SortedSet st = null;
+            int t = 0;
+
+            int sec = cl.get(Calendar.SECOND);
+            int min = cl.get(Calendar.MINUTE);
+
+            // get second.................................................
+            st = seconds.tailSet(sec);
+            if (st != null && st.size() != 0) {
+                sec = st.first();
+            } else {
+                sec = seconds.first();
+                min++;
+                cl.set(Calendar.MINUTE, min);
+            }
+            cl.set(Calendar.SECOND, sec);
+
+            min = cl.get(Calendar.MINUTE);
+            int hr = cl.get(Calendar.HOUR_OF_DAY);
+            t = -1;
+
+            // get minute.................................................
+            st = minutes.tailSet(min);
+            if (st != null && st.size() != 0) {
+                t = min;
+                min = st.first();
+            } else {
+                min = minutes.first();
+                hr++;
+            }
+            if (min != t) {
+                cl.set(Calendar.SECOND, 0);
+                cl.set(Calendar.MINUTE, min);
+                setCalendarHour(cl, hr);
+                continue;
+            }
+            cl.set(Calendar.MINUTE, min);
+
+            hr = cl.get(Calendar.HOUR_OF_DAY);
+            int day = cl.get(Calendar.DAY_OF_MONTH);
+            t = -1;
+
+            // get hour...................................................
+            st = hours.tailSet(hr);
+            if (st != null && st.size() != 0) {
+                t = hr;
+                hr = st.first();
+            } else {
+                hr = hours.first();
+                day++;
+            }
+            if (hr != t) {
+                cl.set(Calendar.SECOND, 0);
+                cl.set(Calendar.MINUTE, 0);
+                cl.set(Calendar.DAY_OF_MONTH, day);
+                setCalendarHour(cl, hr);
+                continue;
+            }
+            cl.set(Calendar.HOUR_OF_DAY, hr);
+
+            day = cl.get(Calendar.DAY_OF_MONTH);
+            int mon = cl.get(Calendar.MONTH) + 1;
+            // '+ 1' because calendar is 0-based for this field, and we are
+            // 1-based
+            t = -1;
+            int tmon = mon;
+
+            // get day...................................................
+            boolean dayOfMSpec = !daysOfMonth.contains(NO_SPEC);
+            boolean dayOfWSpec = !daysOfWeek.contains(NO_SPEC);
+            if (dayOfMSpec && !dayOfWSpec) { // get day by day of month rule
+                st = daysOfMonth.tailSet(day);
+                if (lastdayOfMonth) {
+                    if (!nearestWeekday) {
+                        t = day;
+                        day = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+                        day -= lastdayOffset;
+                        if (t > day) {
+                            mon++;
+                            if (mon > 12) {
+                                mon = 1;
+                                tmon = 3333; // ensure test of mon != tmon further below fails
+                                cl.add(Calendar.YEAR, 1);
+                            }
+                            day = 1;
+                        }
+                    } else {
+                        t = day;
+                        day = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+                        day -= lastdayOffset;
+
+                        Calendar tcal = Calendar.getInstance(getTimeZone());
+                        tcal.set(Calendar.SECOND, 0);
+                        tcal.set(Calendar.MINUTE, 0);
+                        tcal.set(Calendar.HOUR_OF_DAY, 0);
+                        tcal.set(Calendar.DAY_OF_MONTH, day);
+                        tcal.set(Calendar.MONTH, mon - 1);
+                        tcal.set(Calendar.YEAR, cl.get(Calendar.YEAR));
+
+                        int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+                        int dow = tcal.get(Calendar.DAY_OF_WEEK);
+
+                        if (dow == Calendar.SATURDAY && day == 1) {
+                            day += 2;
+                        } else if (dow == Calendar.SATURDAY) {
+                            day -= 1;
+                        } else if (dow == Calendar.SUNDAY && day == ldom) {
+                            day -= 2;
+                        } else if (dow == Calendar.SUNDAY) {
+                            day += 1;
+                        }
+
+                        tcal.set(Calendar.SECOND, sec);
+                        tcal.set(Calendar.MINUTE, min);
+                        tcal.set(Calendar.HOUR_OF_DAY, hr);
+                        tcal.set(Calendar.DAY_OF_MONTH, day);
+                        tcal.set(Calendar.MONTH, mon - 1);
+                        Date nTime = tcal.getTime();
+                        if (nTime.before(afterTime)) {
+                            day = 1;
+                            mon++;
+                        }
+                    }
+                } else if (nearestWeekday) {
+                    t = day;
+                    day = daysOfMonth.first();
+
+                    Calendar tcal = Calendar.getInstance(getTimeZone());
+                    tcal.set(Calendar.SECOND, 0);
+                    tcal.set(Calendar.MINUTE, 0);
+                    tcal.set(Calendar.HOUR_OF_DAY, 0);
+                    tcal.set(Calendar.DAY_OF_MONTH, day);
+                    tcal.set(Calendar.MONTH, mon - 1);
+                    tcal.set(Calendar.YEAR, cl.get(Calendar.YEAR));
+
+                    int ldom = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+                    int dow = tcal.get(Calendar.DAY_OF_WEEK);
+
+                    if (dow == Calendar.SATURDAY && day == 1) {
+                        day += 2;
+                    } else if (dow == Calendar.SATURDAY) {
+                        day -= 1;
+                    } else if (dow == Calendar.SUNDAY && day == ldom) {
+                        day -= 2;
+                    } else if (dow == Calendar.SUNDAY) {
+                        day += 1;
+                    }
+
+
+                    tcal.set(Calendar.SECOND, sec);
+                    tcal.set(Calendar.MINUTE, min);
+                    tcal.set(Calendar.HOUR_OF_DAY, hr);
+                    tcal.set(Calendar.DAY_OF_MONTH, day);
+                    tcal.set(Calendar.MONTH, mon - 1);
+                    Date nTime = tcal.getTime();
+                    if (nTime.before(afterTime)) {
+                        day = daysOfMonth.first();
+                        mon++;
+                    }
+                } else if (st != null && st.size() != 0) {
+                    t = day;
+                    day = st.first();
+                    // make sure we don't over-run a short month, such as february
+                    int lastDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+                    if (day > lastDay) {
+                        day = daysOfMonth.first();
+                        mon++;
+                    }
+                } else {
+                    day = daysOfMonth.first();
+                    mon++;
+                }
+
+                if (day != t || mon != tmon) {
+                    cl.set(Calendar.SECOND, 0);
+                    cl.set(Calendar.MINUTE, 0);
+                    cl.set(Calendar.HOUR_OF_DAY, 0);
+                    cl.set(Calendar.DAY_OF_MONTH, day);
+                    cl.set(Calendar.MONTH, mon - 1);
+                    // '- 1' because calendar is 0-based for this field, and we
+                    // are 1-based
+                    continue;
+                }
+            } else if (dayOfWSpec && !dayOfMSpec) { // get day by day of week rule
+                if (lastdayOfWeek) { // are we looking for the last XXX day of
+                    // the month?
+                    int dow = daysOfWeek.first(); // desired
+                    // d-o-w
+                    int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+                    int daysToAdd = 0;
+                    if (cDow < dow) {
+                        daysToAdd = dow - cDow;
+                    }
+                    if (cDow > dow) {
+                        daysToAdd = dow + (7 - cDow);
+                    }
+
+                    int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+
+                    if (day + daysToAdd > lDay) { // did we already miss the
+                        // last one?
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, 1);
+                        cl.set(Calendar.MONTH, mon);
+                        // no '- 1' here because we are promoting the month
+                        continue;
+                    }
+
+                    // find date of last occurrence of this day in this month...
+                    while ((day + daysToAdd + 7) <= lDay) {
+                        daysToAdd += 7;
+                    }
+
+                    day += daysToAdd;
+
+                    if (daysToAdd > 0) {
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, day);
+                        cl.set(Calendar.MONTH, mon - 1);
+                        // '- 1' here because we are not promoting the month
+                        continue;
+                    }
+
+                } else if (nthdayOfWeek != 0) {
+                    // are we looking for the Nth XXX day in the month?
+                    int dow = daysOfWeek.first(); // desired
+                    // d-o-w
+                    int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+                    int daysToAdd = 0;
+                    if (cDow < dow) {
+                        daysToAdd = dow - cDow;
+                    } else if (cDow > dow) {
+                        daysToAdd = dow + (7 - cDow);
+                    }
+
+                    boolean dayShifted = false;
+                    if (daysToAdd > 0) {
+                        dayShifted = true;
+                    }
+
+                    day += daysToAdd;
+                    int weekOfMonth = day / 7;
+                    if (day % 7 > 0) {
+                        weekOfMonth++;
+                    }
+
+                    daysToAdd = (nthdayOfWeek - weekOfMonth) * 7;
+                    day += daysToAdd;
+                    if (daysToAdd < 0
+                            || day > getLastDayOfMonth(mon, cl
+                            .get(Calendar.YEAR))) {
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, 1);
+                        cl.set(Calendar.MONTH, mon);
+                        // no '- 1' here because we are promoting the month
+                        continue;
+                    } else if (daysToAdd > 0 || dayShifted) {
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, day);
+                        cl.set(Calendar.MONTH, mon - 1);
+                        // '- 1' here because we are NOT promoting the month
+                        continue;
+                    }
+                } else {
+                    int cDow = cl.get(Calendar.DAY_OF_WEEK); // current d-o-w
+                    int dow = daysOfWeek.first(); // desired
+                    // d-o-w
+                    st = daysOfWeek.tailSet(cDow);
+                    if (st != null && st.size() > 0) {
+                        dow = st.first();
+                    }
+
+                    int daysToAdd = 0;
+                    if (cDow < dow) {
+                        daysToAdd = dow - cDow;
+                    }
+                    if (cDow > dow) {
+                        daysToAdd = dow + (7 - cDow);
+                    }
+
+                    int lDay = getLastDayOfMonth(mon, cl.get(Calendar.YEAR));
+
+                    if (day + daysToAdd > lDay) { // will we pass the end of
+                        // the month?
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, 1);
+                        cl.set(Calendar.MONTH, mon);
+                        // no '- 1' here because we are promoting the month
+                        continue;
+                    } else if (daysToAdd > 0) { // are we swithing days?
+                        cl.set(Calendar.SECOND, 0);
+                        cl.set(Calendar.MINUTE, 0);
+                        cl.set(Calendar.HOUR_OF_DAY, 0);
+                        cl.set(Calendar.DAY_OF_MONTH, day + daysToAdd);
+                        cl.set(Calendar.MONTH, mon - 1);
+                        // '- 1' because calendar is 0-based for this field,
+                        // and we are 1-based
+                        continue;
+                    }
+                }
+            } else { // dayOfWSpec && !dayOfMSpec
+                throw new UnsupportedOperationException(
+                        "Support for specifying both a day-of-week AND a day-of-month parameter is not implemented.");
+            }
+            cl.set(Calendar.DAY_OF_MONTH, day);
+
+            mon = cl.get(Calendar.MONTH) + 1;
+            // '+ 1' because calendar is 0-based for this field, and we are
+            // 1-based
+            int year = cl.get(Calendar.YEAR);
+            t = -1;
+
+            // test for expressions that never generate a valid fire date,
+            // but keep looping...
+            if (year > MAX_YEAR) {
+                return null;
+            }
+
+            // get month...................................................
+            st = months.tailSet(mon);
+            if (st != null && st.size() != 0) {
+                t = mon;
+                mon = st.first();
+            } else {
+                mon = months.first();
+                year++;
+            }
+            if (mon != t) {
+                cl.set(Calendar.SECOND, 0);
+                cl.set(Calendar.MINUTE, 0);
+                cl.set(Calendar.HOUR_OF_DAY, 0);
+                cl.set(Calendar.DAY_OF_MONTH, 1);
+                cl.set(Calendar.MONTH, mon - 1);
+                // '- 1' because calendar is 0-based for this field, and we are
+                // 1-based
+                cl.set(Calendar.YEAR, year);
+                continue;
+            }
+            cl.set(Calendar.MONTH, mon - 1);
+            // '- 1' because calendar is 0-based for this field, and we are
+            // 1-based
+
+            year = cl.get(Calendar.YEAR);
+            t = -1;
+
+            // get year...................................................
+            st = years.tailSet(year);
+            if (st != null && st.size() != 0) {
+                t = year;
+                year = st.first();
+            } else {
+                return null; // ran out of years...
+            }
+
+            if (year != t) {
+                cl.set(Calendar.SECOND, 0);
+                cl.set(Calendar.MINUTE, 0);
+                cl.set(Calendar.HOUR_OF_DAY, 0);
+                cl.set(Calendar.DAY_OF_MONTH, 1);
+                cl.set(Calendar.MONTH, 0);
+                // '- 1' because calendar is 0-based for this field, and we are
+                // 1-based
+                cl.set(Calendar.YEAR, year);
+                continue;
+            }
+            cl.set(Calendar.YEAR, year);
+
+            gotOne = true;
+        } // while( !done )
+
+        return cl.getTime();
+    }
+
+    /**
+     * Advance the calendar to the particular hour paying particular attention
+     * to daylight saving problems.
+     *
+     * @param cal  the calendar to operate on
+     * @param hour the hour to set
+     */
+    protected void setCalendarHour(Calendar cal, int hour) {
+        cal.set(Calendar.HOUR_OF_DAY, hour);
+        if (cal.get(Calendar.HOUR_OF_DAY) != hour && hour != 24) {
+            cal.set(Calendar.HOUR_OF_DAY, hour + 1);
+        }
+    }
+
+    /**
+     * NOT YET IMPLEMENTED: Returns the time before the given time
+     * that the CronExpression matches.
+     */
+    public Date getTimeBefore(Date endTime) {
+        // FUTURE_TODO: implement QUARTZ-423
+        return null;
+    }
+
+    /**
+     * NOT YET IMPLEMENTED: Returns the final time that the
+     * CronExpression will match.
+     */
+    public Date getFinalFireTime() {
+        // FUTURE_TODO: implement QUARTZ-423
+        return null;
+    }
+
+    protected boolean isLeapYear(int year) {
+        return ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0));
+    }
+
+    protected int getLastDayOfMonth(int monthNum, int year) {
+
+        switch (monthNum) {
+            case 1:
+                return 31;
+            case 2:
+                return (isLeapYear(year)) ? 29 : 28;
+            case 3:
+                return 31;
+            case 4:
+                return 30;
+            case 5:
+                return 31;
+            case 6:
+                return 30;
+            case 7:
+                return 31;
+            case 8:
+                return 31;
+            case 9:
+                return 30;
+            case 10:
+                return 31;
+            case 11:
+                return 30;
+            case 12:
+                return 31;
+            default:
+                throw new IllegalArgumentException("Illegal month number: "
+                        + monthNum);
+        }
+    }
+
+
+    private void readObject(java.io.ObjectInputStream stream)
+            throws java.io.IOException, ClassNotFoundException {
+
+        stream.defaultReadObject();
+        try {
+            buildExpression(cronExpression);
+        } catch (Exception ignore) {
+        } // never happens
+    }
+
+    @Override
+    @Deprecated
+    public Object clone() {
+        return new CronExpression(this);
+    }
+}
+
+class ValueSet {
+    public int value;
+
+    public int pos;
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Task.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Task.java
new file mode 100644
index 0000000..2708ab0
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/Task.java
@@ -0,0 +1,19 @@
+package com.njzscloud.common.sichen.support;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+
+@Target({METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Task {
+    String value() default "";
+
+    String memo() default "";
+
+    String cron() default "";
+
+    int period() default 0;
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskHandle.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskHandle.java
new file mode 100644
index 0000000..d8683fc
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskHandle.java
@@ -0,0 +1,72 @@
+package com.njzscloud.common.sichen.support;
+
+import cn.hutool.core.util.IdUtil;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.sichen.contant.TaskStatus;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Method;
+
+@Getter
+@Setter
+@Slf4j
+@Accessors(chain = true)
+public class TaskHandle implements Runnable {
+    private Long taskId;
+    private Long scheduleId;
+    private String memo;
+
+    private String fname;
+    private Tuple2 fn;
+    private TaskStatus status;
+    private Long startTime;
+    private Long endTime;
+
+    public TaskHandle(TaskInfo taskInfo) {
+        this.taskId = taskInfo.getId();
+        this.scheduleId = IdUtil.getSnowflakeNextId();
+        this.memo = taskInfo.getMemo();
+        this.status = TaskStatus.Waiting;
+        this.fname = taskInfo.getFn();
+        this.fn = Cable.getFn(this.fname);
+    }
+
+    @Override
+    public void run() {
+        if (status != TaskStatus.Pending) {
+            return;
+        }
+        status = TaskStatus.Running;
+        startTime = System.currentTimeMillis();
+        try {
+            if (fn == null) {
+                status = TaskStatus.Error;
+                log.error("任务执行失败：{}，任务处理函数不存在：{}", memo, fname);
+            }
+            fn.get_1().invoke(fn.get_0());
+            status = TaskStatus.Completed;
+        } catch (Throwable e) {
+            status = TaskStatus.Error;
+            log.error("任务执行失败：{}", memo, e);
+        } finally {
+            endTime = System.currentTimeMillis();
+            Cable.report(this);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "TaskHandle{" +
+                "taskId=" + taskId +
+                ", scheduleId=" + scheduleId +
+                ", taskName='" + memo + '\'' +
+                ", fname='" + fname + '\'' +
+                ", status=" + status +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                '}';
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskInfo.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskInfo.java
new file mode 100644
index 0000000..aa0ecf8
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskInfo.java
@@ -0,0 +1,48 @@
+package com.njzscloud.common.sichen.support;
+
+import cn.hutool.core.date.DateUtil;
+import com.njzscloud.common.sichen.contant.ScheduleType;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+@Setter
+@Getter
+@Slf4j
+@Accessors(chain = true)
+public class TaskInfo {
+    private Long id;
+    private String memo;
+    private String fn;
+    private ScheduleType scheduleType;
+    private String scheduleConf;
+    private Long criticalTiming;
+
+
+    public TaskInfo() {
+    }
+
+    public TaskInfo(TaskInfo taskInfo) {
+        id = taskInfo.id;
+        memo = taskInfo.memo;
+        fn = taskInfo.fn;
+        scheduleType = taskInfo.scheduleType;
+        scheduleConf = taskInfo.scheduleConf;
+        criticalTiming = taskInfo.criticalTiming;
+    }
+
+    @Override
+    public String toString() {
+        return "TaskInfo{" +
+                "id=" + id +
+                ", memo='" + memo + '\'' +
+                ", fn='" + fn + '\'' +
+                ", scheduleType=" + scheduleType +
+                ", scheduleConf='" + scheduleConf + '\'' +
+                ", criticalTiming=" + DateUtil.formatDateTime(new Date(criticalTiming * 1000)) +
+                '}';
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java
new file mode 100644
index 0000000..c6244c8
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java
@@ -0,0 +1,107 @@
+package com.njzscloud.common.sichen.support;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.core.utils.GroupUtil;
+import com.njzscloud.common.sichen.SysTaskEntity;
+import com.njzscloud.common.sichen.SysTaskService;
+import com.njzscloud.common.sichen.contant.ScheduleType;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RequiredArgsConstructor
+public class TaskStore implements BeanPostProcessor {
+    private final Map> fn = new HashMap<>();
+    private final List tasks = new LinkedList<>();
+    private final SysTaskService sysTaskService;
+
+
+    public Tuple2 getFn(String fname) {
+        return fn.get(fname);
+    }
+
+    public List load(long now, long soon) {
+        // log.info("加载任务：{}", DateUtil.formatDateTime(new Date(soon * 1000)));
+        List l1 = sysTaskService.list(Wrappers.lambdaQuery()
+                        .lt(SysTaskEntity::getCriticalTiming, soon)
+                        .eq(SysTaskEntity::getDisabled, false)
+                )
+                .stream()
+                .map(it -> BeanUtil.copyProperties(it, TaskInfo.class))
+                .collect(Collectors.toList());
+        List l2 = tasks.stream()
+                .filter(it -> it.getCriticalTiming() <= soon)
+                .collect(Collectors.toList());
+        l2.addAll(l1);
+        return l2;
+    }
+
+    public void update(List tasks) {
+        if (tasks == null || tasks.isEmpty()) return;
+        Map map = GroupUtil.k_o(tasks, TaskInfo::getId);
+
+        ArrayList list = new ArrayList<>();
+        for (TaskInfo task : this.tasks) {
+            TaskInfo taskInfo = map.get(task.getId());
+            if (taskInfo == null) {
+                list.add(new SysTaskEntity()
+                        .setId(task.getId())
+                        .setCriticalTiming(task.getCriticalTiming())
+                        .setDisabled(task.getCriticalTiming() <= 0 ? true : null)
+                );
+                continue;
+            }
+            task.setCriticalTiming(taskInfo.getCriticalTiming());
+        }
+        if (list.isEmpty()) return;
+        sysTaskService.updateBatchById(list);
+    }
+
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        Class clazz = bean.getClass();
+        for (Method method : clazz.getDeclaredMethods()) {
+            Task task = method.getAnnotation(Task.class);
+            if (task != null) {
+                String value = task.value();
+                String fname = StrUtil.isBlank(value) ? method.getName() : value;
+                if (fn.containsKey(fname)) {
+                    log.warn("任务执行函数重复：{}", fname);
+                    continue;
+                } else {
+                    fn.put(fname, Tuple2.create(bean, method));
+                    log.info("任务执行函数：{}", fname);
+                }
+
+                int period = task.period();
+                String cron = task.cron();
+                if (StrUtil.isNotBlank(cron) || period > 0) {
+                    String memo_ = task.memo();
+                    String memo = StrUtil.isBlank(memo_) ? clazz.getCanonicalName() + "#" + method.getName() : memo_;
+                    String scheduleConf = StrUtil.isNotBlank(cron) ? cron : String.valueOf(period);
+                    ScheduleType scheduleType = StrUtil.isNotBlank(cron) ? ScheduleType.Cron : ScheduleType.Fixed;
+                    tasks.add(new TaskInfo()
+                            .setId(IdUtil.getSnowflakeNextId())
+                            .setMemo(memo)
+                            .setFn(fname)
+                            .setScheduleType(scheduleType)
+                            .setScheduleConf(scheduleConf)
+                            .setCriticalTiming(TaskUtil.computedNextTiming(scheduleType, scheduleConf))
+                    );
+                    log.info("添加任务：{}", memo);
+                }
+            }
+        }
+        return bean;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskUtil.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskUtil.java
new file mode 100644
index 0000000..02c4fc3
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskUtil.java
@@ -0,0 +1,39 @@
+package com.njzscloud.common.sichen.support;
+
+import com.njzscloud.common.sichen.contant.ScheduleType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.ParseException;
+import java.util.Date;
+
+@Slf4j
+public final class TaskUtil {
+    public static long computedNextTiming(long now, TaskInfo taskInfo) {
+        return computedNextTiming(now, taskInfo.getScheduleType(), taskInfo.getScheduleConf());
+    }
+
+    public static long computedNextTiming(TaskInfo taskInfo) {
+        return computedNextTiming(System.currentTimeMillis() / 1000, taskInfo.getScheduleType(), taskInfo.getScheduleConf());
+    }
+
+    public static long computedNextTiming(ScheduleType scheduleType, String scheduleConf) {
+        return computedNextTiming(System.currentTimeMillis() / 1000, scheduleType, scheduleConf);
+    }
+
+    public static long computedNextTiming(long now, ScheduleType scheduleType, String scheduleConf) {
+        switch (scheduleType) {
+            case Fixed:
+                return new Date(now * 1000 + Long.parseLong(scheduleConf) * 1000L).getTime() / 1000;
+            case Cron:
+                try {
+                    return new CronExpression(scheduleConf)
+                            .getNextValidTimeAfter(new Date(now * 1000))
+                            .getTime() / 1000;
+                } catch (ParseException e) {
+                    log.error("任务调度表达式解析错误", e);
+                    return 0;
+                }
+        }
+        return 0;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-sichen/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..cf9406e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sichen/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
+  com.njzscloud.common.sichen.config.TaskAutoConfiguration
diff --git a/njzscloud-common/njzscloud-common-sn/pom.xml b/njzscloud-common/njzscloud-common-sn/pom.xml
new file mode 100644
index 0000000..4e3c9bd
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/pom.xml
@@ -0,0 +1,42 @@
+
+    4.0.0
+    
+        com.njzscloud
+        njzscloud-common
+        0.0.1
+    
+
+    njzscloud-common-sn
+    jar
+
+    njzscloud-common-sn
+    http://maven.apache.org
+
+    
+        UTF-8
+    
+
+    
+        
+            com.njzscloud
+            njzscloud-common-core
+            provided
+        
+        
+            com.njzscloud
+            njzscloud-common-mp
+            provided
+        
+        
+            com.njzscloud
+            njzscloud-common-mvc
+        
+        
+        
+            org.junit.jupiter
+            junit-jupiter-engine
+            test
+        
+    
+
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/AddSnConfigParam.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/AddSnConfigParam.java
new file mode 100644
index 0000000..9ac04cf
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/AddSnConfigParam.java
@@ -0,0 +1,42 @@
+package com.njzscloud.common.sn;
+
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@Constraint
+public class AddSnConfigParam implements Constrained {
+    /**
+     * 编码名称; 字典编码：sncode
+     */
+    @NotBlank(message = "编码名称不能为空")
+    private String sncode;
+    /**
+     * 配置
+     */
+    private List> config;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> config != null && !config.isEmpty(), "编码规则不能为空"),
+        };
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/ModifySnConfigParam.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/ModifySnConfigParam.java
new file mode 100644
index 0000000..0df7e0d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/ModifySnConfigParam.java
@@ -0,0 +1,38 @@
+package com.njzscloud.common.sn;
+
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@Constraint
+public class ModifySnConfigParam implements Constrained {
+    private Long id;
+
+    /**
+     * 配置
+     */
+    private List> config;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> config != null && !config.isEmpty(), "编码规则不能为空"),
+        };
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnEntity.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnEntity.java
new file mode 100644
index 0000000..de5c235
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnEntity.java
@@ -0,0 +1,61 @@
+package com.njzscloud.common.sn;
+
+import com.njzscloud.common.sn.contant.PadMode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.ToString;
+
+/**
+ * 递增编码表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_inc_sn")
+public class SysIncSnEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     *
+     */
+    private String code;
+
+    /**
+     *
+     */
+    private Long val;
+
+    /**
+     *
+     */
+    private Integer step;
+
+    /**
+     *
+     */
+    private Long initialVal;
+
+    /**
+     *
+     */
+    private PadMode padMode;
+
+    /**
+     *
+     */
+    private String padVal;
+
+    /**
+     *
+     */
+    private Integer padLen;
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnMapper.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnMapper.java
new file mode 100644
index 0000000..9b6800d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnMapper.java
@@ -0,0 +1,12 @@
+package com.njzscloud.common.sn;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 递增编码表
+ */
+@Mapper
+public interface SysIncSnMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnService.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnService.java
new file mode 100644
index 0000000..62270e1
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysIncSnService.java
@@ -0,0 +1,77 @@
+package com.njzscloud.common.sn;
+
+import lombok.extern.slf4j.Slf4j;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 递增编码表
+ */
+@Slf4j
+public class SysIncSnService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysIncSnEntity 数据
+     */
+    public void add(SysIncSnEntity sysIncSnEntity) {
+        this.save(sysIncSnEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysIncSnEntity 数据
+     */
+    public void modify(SysIncSnEntity sysIncSnEntity) {
+        this.updateById(sysIncSnEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysIncCodeEntity 结果
+     */
+    public SysIncSnEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysIncSnEntity 筛选条件
+     * @param pageParam      分页参数
+     * @return PageResult<SysIncCodeEntity> 分页结果
+     */
+    public PageResult paging(PageParam pageParam, SysIncSnEntity sysIncSnEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysIncSnEntity)));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long inc(String code) {
+        SysIncSnEntity incCodeEntity = this.getOne(Wrappers.lambdaQuery()
+                .eq(SysIncSnEntity::getCode, code));
+        Long val = incCodeEntity.getVal();
+        val += incCodeEntity.getStep();
+        this.updateById(incCodeEntity.setVal(val));
+        return val;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigController.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigController.java
new file mode 100644
index 0000000..4c07c74
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigController.java
@@ -0,0 +1,86 @@
+package com.njzscloud.common.sn;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.sn.support.SnUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 编码配置表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_sn_config")
+@RequiredArgsConstructor
+public class SysSnConfigController {
+
+    private final SysSnConfigService sysSnConfigService;
+
+    /**
+     * 新增
+     *
+     * @param addSnConfigParam 数据
+     */
+    @PostMapping("/add")
+    public R add(@Validated @RequestBody AddSnConfigParam addSnConfigParam) {
+        sysSnConfigService.add(addSnConfigParam);
+        return R.success();
+    }
+
+    @GetMapping("/next")
+    public R next(@RequestParam(required = false, defaultValue = "Default") String sncode) {
+        return R.success(SnUtil.next(sncode));
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysSnConfigEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody ModifySnConfigParam modifySnConfigParam) {
+        sysSnConfigService.modify(modifySnConfigParam);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysSnConfigService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysSnConfigEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysSnConfigService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysSnConfigEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysSnConfigEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysSnConfigEntity sysSnConfigEntity) {
+        return R.success(sysSnConfigService.paging(pageParam, sysSnConfigEntity));
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigEntity.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigEntity.java
new file mode 100644
index 0000000..33a2918
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigEntity.java
@@ -0,0 +1,47 @@
+package com.njzscloud.common.sn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njzscloud.common.sn.support.SectionConfig;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 编码配置表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName(value = "sys_sn_config", autoResultMap = true)
+public class SysSnConfigEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 编码名称
+     */
+    private String sncode;
+
+    /**
+     * 配置
+     */
+    @TableField(typeHandler = com.njzscloud.common.mp.support.handler.j.JsonTypeHandler.class)
+    private List config;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigMapper.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigMapper.java
new file mode 100644
index 0000000..7af3a14
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigMapper.java
@@ -0,0 +1,12 @@
+package com.njzscloud.common.sn;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 编码配置表
+ */
+@Mapper
+public interface SysSnConfigMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigService.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigService.java
new file mode 100644
index 0000000..a77207d
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/SysSnConfigService.java
@@ -0,0 +1,120 @@
+package com.njzscloud.common.sn;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.sn.support.IncSectionConfig;
+import com.njzscloud.common.sn.support.SectionConfig;
+import com.njzscloud.common.sn.support.Sn;
+import com.njzscloud.common.sn.support.SnUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 编码配置表
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class SysSnConfigService extends ServiceImpl implements IService {
+    private final SysIncSnService sysIncSnService;
+
+    @Transactional(rollbackFor = Exception.class)
+    public Sn getSn(String sncode) {
+        SysSnConfigEntity configEntity = this.getOne(Wrappers.lambdaQuery().eq(SysSnConfigEntity::getSncode, sncode));
+        if (configEntity == null) return new Sn();
+        List configs = configEntity.getConfig();
+        return new Sn(configs);
+    }
+
+    /**
+     * 新增
+     *
+     * @param addSnConfigParam 数据
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void add(AddSnConfigParam addSnConfigParam) {
+        List configs = addSnConfigParam.getConfig()
+                .stream()
+                .map(SnUtil::resolve)
+                .collect(Collectors.toList());
+
+
+        this.save(new SysSnConfigEntity()
+                .setSncode(addSnConfigParam.getSncode())
+                .setMemo(addSnConfigParam.getMemo())
+                .setConfig(configs)
+        );
+
+        List collect = configs
+                .stream()
+                .filter(it -> it.getClass() == IncSectionConfig.class)
+                .map(it -> {
+                    IncSectionConfig config = (IncSectionConfig) it;
+                    return new SysIncSnEntity()
+                            .setCode(config.getCode())
+                            .setVal((long) config.getInitialVal())
+                            .setStep(config.getStep())
+                            .setInitialVal((long) config.getInitialVal())
+                            .setPadMode(config.getPadMode())
+                            .setPadVal(config.getPadVal())
+                            .setPadLen(config.getPadLen());
+                }).collect(Collectors.toList());
+        if (collect.isEmpty()) return;
+        sysIncSnService.saveBatch(collect);
+    }
+
+    /**
+     * 修改
+     *
+     * @param modifySnConfigParam 数据
+     */
+    public void modify(ModifySnConfigParam modifySnConfigParam) {
+        List configs = modifySnConfigParam.getConfig()
+                .stream()
+                .map(SnUtil::resolve)
+                .collect(Collectors.toList());
+        this.updateById(new SysSnConfigEntity()
+                .setId(modifySnConfigParam.getId())
+                .setMemo(modifySnConfigParam.getMemo())
+                .setConfig(configs)
+        );
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysSnConfigEntity 结果
+     */
+    public SysSnConfigEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysSnConfigEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysSnConfigEntity> 分页结果
+     */
+    public PageResult paging(PageParam pageParam, SysSnConfigEntity sysSnConfigEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysSnConfigEntity)));
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnAutoConfiguration.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnAutoConfiguration.java
new file mode 100644
index 0000000..10fca88
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnAutoConfiguration.java
@@ -0,0 +1,30 @@
+package com.njzscloud.common.sn.config;
+
+import com.njzscloud.common.sn.SysIncSnService;
+import com.njzscloud.common.sn.SysSnConfigController;
+import com.njzscloud.common.sn.SysSnConfigService;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.njzscloud.common.sn")
+@EnableConfigurationProperties(SnProperties.class)
+public class SnAutoConfiguration {
+
+    @Bean
+    public SysIncSnService sysIncSnService() {
+        return new SysIncSnService();
+    }
+
+    @Bean
+    public SysSnConfigService sysSnConfigService(SysIncSnService sysIncSnService) {
+        return new SysSnConfigService(sysIncSnService);
+    }
+
+    @Bean
+    public SysSnConfigController sysSnConfigController(SysSnConfigService sysSnConfigService) {
+        return new SysSnConfigController(sysSnConfigService);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnProperties.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnProperties.java
new file mode 100644
index 0000000..e55b7b7
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/config/SnProperties.java
@@ -0,0 +1,15 @@
+package com.njzscloud.common.sn.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@ConfigurationProperties(prefix = "sn")
+public class SnProperties {
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/PadMode.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/PadMode.java
new file mode 100644
index 0000000..0bcbf69
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/PadMode.java
@@ -0,0 +1,21 @@
+package com.njzscloud.common.sn.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：pad_mode
+ * 字典名称：填充模式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum PadMode implements DictStr {
+    Wu("Wu", "无"),
+    Zuo("Zuo", "左"),
+    You("You", "右");
+
+    private final String val;
+
+    private final String txt;
+}    
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/RandomMode.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/RandomMode.java
new file mode 100644
index 0000000..4f43e8b
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/RandomMode.java
@@ -0,0 +1,21 @@
+package com.njzscloud.common.sn.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：random_mode
+ * 字典名称：随机模式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum RandomMode implements DictStr {
+    SnowFlake("SnowFlake", "雪花码"),
+    UUID("UUID", "UUID"),
+    NanoId("NanoId", "NanoId");
+
+    private final String val;
+
+    private final String txt;
+}    
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/SnSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/SnSection.java
new file mode 100644
index 0000000..2187081
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/contant/SnSection.java
@@ -0,0 +1,22 @@
+package com.njzscloud.common.sn.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：sn_section
+ * 字典名称：编码类型
+ */
+@Getter
+@RequiredArgsConstructor
+public enum SnSection implements DictStr {
+    GuDing("GuDing", "固定"),
+    ShiJian("ShiJian", "时间"),
+    ZiZeng("ZiZeng", "自增"),
+    SuiJi("SuiJi", "随机");
+
+    private final String val;
+
+    private final String txt;
+}    
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSection.java
new file mode 100644
index 0000000..fada98c
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSection.java
@@ -0,0 +1,13 @@
+package com.njzscloud.common.sn.support;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class FixedSection implements ISnSection {
+    private final String value;
+
+    @Override
+    public String next() {
+        return value;
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSectionConfig.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSectionConfig.java
new file mode 100644
index 0000000..5131fc5
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/FixedSectionConfig.java
@@ -0,0 +1,32 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.sn.contant.SnSection;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class FixedSectionConfig implements SectionConfig {
+    private final SnSection sectionName = SnSection.GuDing;
+    private String value;
+
+    @Override
+    public ISnSection section() {
+        return new FixedSection(value);
+    }
+
+    @Override
+    public void resolve(Map config) {
+        value = MapUtil.getStr(config, "value");
+        Assert.notBlank(value, () -> Exceptions.clierr("固定编码配置错误，未设置字段 value"));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/ISnSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/ISnSection.java
new file mode 100644
index 0000000..1b550c6
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/ISnSection.java
@@ -0,0 +1,5 @@
+package com.njzscloud.common.sn.support;
+
+public interface ISnSection {
+    String next();
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSection.java
new file mode 100644
index 0000000..fc4fcb4
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSection.java
@@ -0,0 +1,30 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.njzscloud.common.sn.SysIncSnService;
+import com.njzscloud.common.sn.contant.PadMode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class IncSection implements ISnSection {
+
+    private final String code;
+    private final Integer step;
+    private final Integer initialVal;
+    private final PadMode padMode;
+    private final String padVal;
+    private final Integer padLen;
+    private final SysIncSnService sysIncSnService = SpringUtil.getBean(SysIncSnService.class);
+
+    @Override
+    public String next() {
+        Long val = sysIncSnService.inc(code);
+        return padMode == PadMode.Zuo ? StrUtil.padPre(val.toString(), padLen, padVal) :
+                padMode == PadMode.You ? StrUtil.padAfter(val.toString(), padLen, padVal) :
+                        val.toString();
+    }
+
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSectionConfig.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSectionConfig.java
new file mode 100644
index 0000000..86da9a7
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/IncSectionConfig.java
@@ -0,0 +1,50 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.core.ienum.Dict;
+import com.njzscloud.common.sn.contant.PadMode;
+import com.njzscloud.common.sn.contant.SnSection;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class IncSectionConfig implements SectionConfig {
+    private final SnSection sectionName = SnSection.ZiZeng;
+    private String code;
+    private Integer step;
+    private Integer initialVal;
+    private PadMode padMode;
+    private String padVal;
+    private Integer padLen;
+
+    @Override
+    public ISnSection section() {
+        return new IncSection(code, step, initialVal, padMode, padVal, padLen);
+    }
+
+    @Override
+    public void resolve(Map config) {
+        code = MapUtil.getStr(config, "code");
+        step = MapUtil.getInt(config, "step");
+        initialVal = MapUtil.getInt(config, "initialVal");
+        padMode = Dict.parse(MapUtil.getStr(config, "padMode"), PadMode.values());
+        padVal = MapUtil.getStr(config, "padVal");
+        padLen = MapUtil.getInt(config, "padLen");
+        Assert.notBlank(code, () -> Exceptions.clierr("递增编码配置错误，为设置字段 code"));
+        Assert.notNull(step, () -> Exceptions.clierr("递增编码配置错误，为设置字段 step"));
+        Assert.notNull(initialVal, () -> Exceptions.clierr("递增编码配置错误，为设置字段 initialVal"));
+        if (padMode != null) {
+            Assert.notBlank(padVal, () -> Exceptions.clierr("递增编码配置错误，为设置字段 padVal"));
+            Assert.notNull(padLen, () -> Exceptions.clierr("递增编码配置错误，为设置字段 padLen"));
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSection.java
new file mode 100644
index 0000000..9285b97
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSection.java
@@ -0,0 +1,42 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.util.IdUtil;
+import com.njzscloud.common.sn.contant.RandomMode;
+
+public class RandomSection implements ISnSection {
+    private final RandomMode randomMode;
+    private final Long workerId;
+    private final Long datacenterId;
+    private final Integer nanoIdSize;
+
+    public RandomSection(RandomMode randomMode, Long workerId, Long datacenterId, Integer nanoIdSize) {
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+        this.nanoIdSize = nanoIdSize;
+        this.randomMode = randomMode;
+    }
+
+    public RandomSection(Long workerId, Long datacenterId) {
+        this(RandomMode.SnowFlake, workerId, datacenterId, 21);
+    }
+
+    public RandomSection(Integer nanoIdSize) {
+        this(RandomMode.NanoId, null, null, nanoIdSize);
+    }
+
+    public RandomSection() {
+        this(RandomMode.UUID, null, null, null);
+    }
+
+    @Override
+    public String next() {
+        switch (randomMode) {
+            case UUID:
+                return IdUtil.simpleUUID();
+            case NanoId:
+                return nanoIdSize == null ? IdUtil.nanoId() : IdUtil.nanoId(nanoIdSize);
+            default:
+                return workerId == null || datacenterId == null ? IdUtil.getSnowflakeNextIdStr() : IdUtil.getSnowflake(workerId, datacenterId).nextIdStr();
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSectionConfig.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSectionConfig.java
new file mode 100644
index 0000000..8a873e3
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/RandomSectionConfig.java
@@ -0,0 +1,53 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.core.ienum.Dict;
+import com.njzscloud.common.sn.contant.RandomMode;
+import com.njzscloud.common.sn.contant.SnSection;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class RandomSectionConfig implements SectionConfig {
+    private final SnSection sectionName = SnSection.SuiJi;
+    private RandomMode randomMode;
+    private Long workerId;
+    private Long datacenterId;
+    private Integer nanoIdSize;
+
+    @Override
+    public ISnSection section() {
+        return new RandomSection(randomMode, workerId, datacenterId, nanoIdSize);
+    }
+
+    @Override
+    public void resolve(Map config) {
+        randomMode = Dict.parse(MapUtil.getStr(config, "randomMode"), RandomMode.values());
+        workerId = MapUtil.getLong(config, "workerId");
+        datacenterId = MapUtil.getLong(config, "datacenterId");
+        nanoIdSize = MapUtil.getInt(config, "nanoIdSize");
+        Assert.notNull(randomMode, () -> Exceptions.clierr("随机编码配置错误，未设置字段 randomMode"));
+        if (randomMode == RandomMode.NanoId) {
+            Assert.notNull(nanoIdSize, () -> Exceptions.clierr("随机编码配置错误，未设置字段 nanoIdSize"));
+            Assert.isNull(workerId, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 workerId"));
+            Assert.isNull(datacenterId, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 datacenterId"));
+        } else if (randomMode == RandomMode.SnowFlake) {
+            Assert.notNull(workerId, () -> Exceptions.clierr("随机编码配置错误，未设置字段 workerId"));
+            Assert.notNull(datacenterId, () -> Exceptions.clierr("随机编码配置错误，未设置字段 datacenterId"));
+            Assert.isNull(nanoIdSize, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 nanoIdSize"));
+        } else {
+            Assert.isNull(workerId, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 workerId"));
+            Assert.isNull(datacenterId, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 datacenterId"));
+            Assert.isNull(nanoIdSize, () -> Exceptions.clierr("随机编码配置错误，无需设置字段 nanoIdSize"));
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SectionConfig.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SectionConfig.java
new file mode 100644
index 0000000..8724231
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SectionConfig.java
@@ -0,0 +1,15 @@
+package com.njzscloud.common.sn.support;
+
+
+import com.njzscloud.common.sn.contant.SnSection;
+
+import java.util.Map;
+
+public interface SectionConfig {
+
+    SnSection getSectionName();
+
+    ISnSection section();
+
+    void resolve(Map config);
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/Sn.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/Sn.java
new file mode 100644
index 0000000..9d22b68
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/Sn.java
@@ -0,0 +1,26 @@
+package com.njzscloud.common.sn.support;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Sn {
+    private final List sections;
+
+    public Sn(List configs) {
+        this.sections = configs.stream().map(SectionConfig::section).collect(Collectors.toList());
+    }
+
+    public Sn() {
+        this.sections = null;
+    }
+
+    public String next() {
+        if (sections == null || sections.isEmpty()) {
+            return null;
+        }
+        return sections.stream()
+                .map(ISnSection::next)
+                .reduce((a, b) -> a + b)
+                .orElseThrow(() -> new RuntimeException("No section found"));
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SnUtil.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SnUtil.java
new file mode 100644
index 0000000..efa9f5e
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/SnUtil.java
@@ -0,0 +1,47 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.core.ienum.Dict;
+import com.njzscloud.common.sn.SysSnConfigService;
+import com.njzscloud.common.sn.contant.SnSection;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class SnUtil {
+
+    private static final SysSnConfigService sysSnConfigService = SpringUtil.getBean(SysSnConfigService.class);
+    private static final Map> SECTIONS = new HashMap<>();
+
+    static {
+        SECTIONS.put(SnSection.GuDing, FixedSectionConfig.class);
+        SECTIONS.put(SnSection.ShiJian, TimeSectionConfig.class);
+        SECTIONS.put(SnSection.ZiZeng, IncSectionConfig.class);
+        SECTIONS.put(SnSection.SuiJi, RandomSectionConfig.class);
+    }
+
+    public static SectionConfig resolve(Map config) {
+        String sectionName = MapUtil.getStr(config, "sectionName");
+        Class sectionClass = SECTIONS.get(Dict.parse(sectionName, SnSection.values()));
+        SectionConfig sectionConfig;
+        try {
+            sectionConfig = sectionClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            throw Exceptions.error("配置解析失败");
+        }
+        sectionConfig.resolve(config);
+        return sectionConfig;
+    }
+
+    public static String next() {
+        return next("Default");
+    }
+
+    public static String next(String sncode) {
+        Assert.notBlank(sncode);
+        return sysSnConfigService.getSn(sncode).next();
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSection.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSection.java
new file mode 100644
index 0000000..0cff135
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSection.java
@@ -0,0 +1,19 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Date;
+
+@RequiredArgsConstructor
+public class TimeSection implements ISnSection {
+
+    private final String pattern;
+    private final Boolean timestamp;
+    private final Integer unit;
+
+    @Override
+    public String next() {
+        return timestamp ? new Date().getTime() / unit + "" : DateUtil.format(new Date(), pattern);
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSectionConfig.java b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSectionConfig.java
new file mode 100644
index 0000000..69b596c
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/java/com/njzscloud/common/sn/support/TimeSectionConfig.java
@@ -0,0 +1,45 @@
+package com.njzscloud.common.sn.support;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.sn.contant.SnSection;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class TimeSectionConfig implements SectionConfig {
+    private final SnSection sectionName = SnSection.ShiJian;
+    private String pattern;
+    private Boolean timestamp;
+    private Integer unit;
+
+    @Override
+    public ISnSection section() {
+        return new TimeSection(pattern, timestamp, unit);
+    }
+
+    @Override
+    public void resolve(Map config) {
+        pattern = MapUtil.getStr(config, "pattern");
+        timestamp = MapUtil.getBool(config, "timestamp", false);
+        unit = MapUtil.getInt(config, "unit");
+        if (timestamp) {
+            Assert.notNull(unit, () -> Exceptions.clierr("时间编码配置错误，为设置字段 unit"));
+            Assert.isTrue(StrUtil.isBlank(pattern), () -> Exceptions.clierr("时间编码配置错误，为设置字段 pattern 与 timestamp 不能同时使用"));
+
+        } else {
+            Assert.notBlank(pattern, () -> Exceptions.clierr("时间编码配置错误，为设置字段 pattern"));
+            Assert.isTrue(unit == null, () -> Exceptions.clierr("时间编码配置错误，为设置字段 unit 与 pattern 不能同时使用"));
+
+        }
+    }
+}
diff --git a/njzscloud-common/njzscloud-common-sn/src/main/resources/META-INF/spring.factories b/njzscloud-common/njzscloud-common-sn/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..296d0fb
--- /dev/null
+++ b/njzscloud-common/njzscloud-common-sn/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
+  com.njzscloud.common.sn.config.SnAutoConfiguration
diff --git a/njzscloud-common/pom.xml b/njzscloud-common/pom.xml
new file mode 100644
index 0000000..6b7f6a0
--- /dev/null
+++ b/njzscloud-common/pom.xml
@@ -0,0 +1,32 @@
+
+
+    4.0.0
+    
+        com.njzscloud
+        big-screen
+        0.0.1
+    
+
+    njzscloud-common
+
+    pom
+
+    
+        njzscloud-common-core
+        njzscloud-common-security
+        njzscloud-common-mp
+        njzscloud-common-mvc
+        njzscloud-common-redis
+        njzscloud-common-minio
+        njzscloud-common-email
+        njzscloud-common-job
+        njzscloud-common-cache
+        njzscloud-common-sichen
+        njzscloud-common-sn
+        njzscloud-common-gen
+    
+
+
+
diff --git a/njzscloud-svr/pom.xml b/njzscloud-svr/pom.xml
new file mode 100644
index 0000000..620ad8c
--- /dev/null
+++ b/njzscloud-svr/pom.xml
@@ -0,0 +1,74 @@
+
+
+    4.0.0
+    
+        com.njzscloud
+        big-screen
+        0.0.1
+    
+    njzscloud-svr
+    jar
+    
+        8
+        8
+        UTF-8
+    
+
+    
+        
+            com.njzscloud
+            njzscloud-common-core
+        
+        
+            com.njzscloud
+            njzscloud-common-security
+            provided
+        
+        
+            com.njzscloud
+            njzscloud-common-mvc
+        
+        
+            com.njzscloud
+            njzscloud-common-mp
+        
+    
+
+
+    
+        
+            
+                org.apache.maven.plugins
+                maven-compiler-plugin
+                3.8.1
+                
+                    
+                        
+                            org.projectlombok
+                            lombok
+                            1.18.30
+                        
+                        
+                            org.mapstruct
+                            mapstruct-processor
+                            ${mapstruct.version}
+                        
+                    
+                
+            
+            
+                org.springframework.boot
+                spring-boot-maven-plugin
+                
+                    
+                        
+                            repackage
+                        
+                    
+                
+            
+        
+    
+
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java
new file mode 100644
index 0000000..f325c6b
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/Main.java
@@ -0,0 +1,12 @@
+package com.njzscloud.supervisory;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Main {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Main.class, args);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/mapper/SysTokenMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/mapper/SysTokenMapper.java
new file mode 100644
index 0000000..c924794
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/mapper/SysTokenMapper.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.auth.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.auth.pojo.SysTokenEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 登录令牌表
+ */
+@Mapper
+public interface SysTokenMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/pojo/SysTokenEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/pojo/SysTokenEntity.java
new file mode 100644
index 0000000..9f531dd
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/pojo/SysTokenEntity.java
@@ -0,0 +1,50 @@
+package com.njzscloud.supervisory.auth.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.ToString;
+
+/**
+ * 登录令牌表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_token")
+public class SysTokenEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户 Id
+     */
+    private Long userId;
+
+    /**
+     * Token Id
+     */
+    private String tid;
+
+    /**
+     * Token 键
+     */
+    private String tkey;
+
+    /**
+     * Token 值
+     */
+    private String tval;
+
+    /**
+     * 用户信息
+     */
+    private String userDetail;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/SecurityService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/SecurityService.java
new file mode 100644
index 0000000..3f185aa
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/SecurityService.java
@@ -0,0 +1,36 @@
+package com.njzscloud.supervisory.auth.service;
+
+import com.njzscloud.common.security.support.*;
+import com.njzscloud.supervisory.resource.service.SysResourceService;
+import com.njzscloud.supervisory.role.service.SysRoleService;
+import com.njzscloud.supervisory.user.service.SysUserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Set;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SecurityService implements IUserService, IResourceService, IRoleService {
+
+    private final SysUserService sysUserService;
+    private final SysRoleService sysRoleService;
+    private final SysResourceService sysResourceService;
+
+    @Override
+    public UserDetail selectUserByAccount(String account) {
+        return sysUserService.getUserInfo(account);
+    }
+
+    @Override
+    public Resource selectResourceByUserId(Long userId) {
+        return sysResourceService.selectResourceByUserId(userId);
+    }
+
+    @Override
+    public Set selectRoleByUserId(Long userId) {
+        return sysRoleService.listUserRole(userId);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/TokenService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/TokenService.java
new file mode 100644
index 0000000..ede6145
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/auth/service/TokenService.java
@@ -0,0 +1,68 @@
+package com.njzscloud.supervisory.auth.service;
+
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.cache.impl.TimedCache;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.njzscloud.common.core.fastjson.Fastjson;
+import com.njzscloud.common.security.contant.Constants;
+import com.njzscloud.common.security.support.ITokenService;
+import com.njzscloud.common.security.support.Token;
+import com.njzscloud.common.security.support.UserDetail;
+import com.njzscloud.supervisory.auth.mapper.SysTokenMapper;
+import com.njzscloud.supervisory.auth.pojo.SysTokenEntity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class TokenService implements ITokenService {
+    private static final TimedCache TOKEN_CACHE = CacheUtil.newTimedCache(1000 * 3600);
+    private final SysTokenMapper sysTokenMapper;
+
+    @Override
+    public synchronized void saveToken(UserDetail userDetail) {
+        Token token = userDetail.getToken();
+        long userId = token.getUserId();
+        String tid = token.getTid();
+        String key = Constants.TOKEN_CACHE_KEY.fill(userId, tid);
+        Long l = sysTokenMapper.selectCount(Wrappers.lambdaQuery().eq(SysTokenEntity::getUserId, token.getUserId()));
+        if (l > 0) return;
+        sysTokenMapper.insert(new SysTokenEntity()
+                .setUserId(userId)
+                .setTid(tid)
+                .setTkey(key)
+                .setTval(token.toString())
+                .setUserDetail(userDetail.toString())
+        );
+    }
+
+    @Override
+    public UserDetail loadUser(String tokenStr) {
+        Token token = Token.create(tokenStr);
+        long userId = token.getUserId();
+        return TOKEN_CACHE.get(userId, () -> Fastjson.toBean(sysTokenMapper
+                        .selectOne(Wrappers.lambdaQuery()
+                                .eq(SysTokenEntity::getUserId, userId))
+                        .getUserDetail(),
+                UserDetail.class));
+    }
+
+    @Override
+    public void removeToken(Token token) {
+        long userId = token.getUserId();
+        TOKEN_CACHE.remove(userId);
+        sysTokenMapper.delete(Wrappers.lambdaQuery()
+                .eq(SysTokenEntity::getUserId, userId)
+        );
+        TOKEN_CACHE.remove(userId);
+    }
+
+    @Override
+    public void removeToken(Long userId) {
+        TOKEN_CACHE.remove(userId);
+        sysTokenMapper.delete(Wrappers.lambdaQuery()
+                .eq(SysTokenEntity::getUserId, userId)
+        );
+        TOKEN_CACHE.remove(userId);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictController.java
new file mode 100644
index 0000000..a2a4ca7
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictController.java
@@ -0,0 +1,94 @@
+package com.njzscloud.supervisory.dict.controller;
+
+import com.njzscloud.supervisory.dict.pojo.SysDictEntity;
+import com.njzscloud.supervisory.dict.pojo.ObtainDictDataResult;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.dict.service.SysDictService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 字典表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_dict")
+@RequiredArgsConstructor
+public class SysDictController {
+
+    private final SysDictService sysDictService;
+
+    /**
+     * 新增
+     *
+     * @param sysDictEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysDictEntity sysDictEntity) {
+        sysDictService.add(sysDictEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDictEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysDictEntity sysDictEntity) {
+        sysDictService.modify(sysDictEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysDictService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDictEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysDictService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDictEntity 筛选条件
+     * @param pageParam     分页参数
+     * @return PageResult<SysDictEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysDictEntity sysDictEntity) {
+        return R.success(sysDictService.paging(pageParam, sysDictEntity));
+    }
+
+
+    /**
+     * 获取字典数据
+     *
+     * @param dictKey 字典标识
+     */
+    @GetMapping("/dict_data")
+    public R> obtainDictData(@RequestParam String dictKey) {
+        return R.success(sysDictService.obtainDictData(dictKey));
+    }
+
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictItemController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictItemController.java
new file mode 100644
index 0000000..6ad4d0f
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/controller/SysDictItemController.java
@@ -0,0 +1,81 @@
+package com.njzscloud.supervisory.dict.controller;
+
+import com.njzscloud.supervisory.dict.pojo.SysDictItemEntity;
+import com.njzscloud.supervisory.dict.service.SysDictItemService;
+import lombok.extern.slf4j.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+
+import java.util.List;
+
+/**
+ * 字典条目表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_dict_item")
+@RequiredArgsConstructor
+public class SysDictItemController {
+
+    private final SysDictItemService sysDictItemService;
+
+    /**
+     * 新增
+     *
+     * @param sysDictItemEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysDictItemEntity sysDictItemEntity) {
+        sysDictItemService.add(sysDictItemEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDictItemEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysDictItemEntity sysDictItemEntity) {
+        sysDictItemService.modify(sysDictItemEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysDictItemService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDictItemEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysDictItemService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDictItemEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysDictItemEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysDictItemEntity sysDictItemEntity) {
+        return R.success(sysDictItemService.paging(pageParam, sysDictItemEntity));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictItemMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictItemMapper.java
new file mode 100644
index 0000000..b7e0af5
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictItemMapper.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.dict.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.dict.pojo.SysDictItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 字典条目表
+ */
+@Mapper
+public interface SysDictItemMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictMapper.java
new file mode 100644
index 0000000..313c3e1
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/mapper/SysDictMapper.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.dict.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.dict.pojo.SysDictEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 字典表
+ */
+@Mapper
+public interface SysDictMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/ObtainDictDataResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/ObtainDictDataResult.java
new file mode 100644
index 0000000..f257d8b
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/ObtainDictDataResult.java
@@ -0,0 +1,60 @@
+package com.njzscloud.supervisory.dict.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 字典条目表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class ObtainDictDataResult {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 字典 Id; sys_dict.id
+     */
+    private Long dictId;
+
+    /**
+     * 字典标识; sys_dict.dict_key
+     */
+    private String dictKey;
+
+    /**
+     * 值; 分类值/字典项值
+     */
+    private String val;
+
+    /**
+     * 显示文本; 分类显示文本/字典项显示文本
+     */
+    private String txt;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictEntity.java
new file mode 100644
index 0000000..e2f8fba
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictEntity.java
@@ -0,0 +1,44 @@
+package com.njzscloud.supervisory.dict.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 字典表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_dict")
+public class SysDictEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 字典标识
+     */
+    private String dictKey;
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictItemEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictItemEntity.java
new file mode 100644
index 0000000..10f88ea
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/pojo/SysDictItemEntity.java
@@ -0,0 +1,59 @@
+package com.njzscloud.supervisory.dict.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 字典条目表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_dict_item")
+public class SysDictItemEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 字典 Id; sys_dict.id
+     */
+    private Long dictId;
+
+    /**
+     * 字典标识; sys_dict.dict_key
+     */
+    private String dictKey;
+
+    /**
+     * 值; 分类值/字典项值
+     */
+    private String val;
+
+    /**
+     * 显示文本; 分类显示文本/字典项显示文本
+     */
+    private String txt;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictItemService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictItemService.java
new file mode 100644
index 0000000..993f17c
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictItemService.java
@@ -0,0 +1,77 @@
+package com.njzscloud.supervisory.dict.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.dict.mapper.SysDictItemMapper;
+import com.njzscloud.supervisory.dict.pojo.SysDictItemEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 字典条目表
+ */
+@Slf4j
+@Service
+public class SysDictItemService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysDictItemEntity 数据
+     */
+
+    public void add(SysDictItemEntity sysDictItemEntity) {
+        this.save(sysDictItemEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDictItemEntity 数据
+     */
+
+    public void modify(SysDictItemEntity sysDictItemEntity) {
+        this.updateById(sysDictItemEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDictItemEntity 结果
+     */
+
+    public SysDictItemEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDictItemEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysDictItemEntity> 分页结果
+     */
+
+    public PageResult paging(PageParam pageParam, SysDictItemEntity sysDictItemEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysDictItemEntity)));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictService.java
new file mode 100644
index 0000000..76605d6
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dict/service/SysDictService.java
@@ -0,0 +1,91 @@
+package com.njzscloud.supervisory.dict.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.dict.mapper.SysDictMapper;
+import com.njzscloud.supervisory.dict.pojo.SysDictEntity;
+import com.njzscloud.supervisory.dict.pojo.SysDictItemEntity;
+import com.njzscloud.supervisory.dict.pojo.ObtainDictDataResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 字典表
+ */
+@Slf4j
+@Service
+public class SysDictService extends ServiceImpl implements IService {
+    @Autowired
+    private SysDictItemService sysDictItemService;
+
+    /**
+     * 新增
+     *
+     * @param sysDictEntity 数据
+     */
+
+    public void add(SysDictEntity sysDictEntity) {
+        this.save(sysDictEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDictEntity 数据
+     */
+
+    public void modify(SysDictEntity sysDictEntity) {
+        this.updateById(sysDictEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDictEntity 结果
+     */
+
+    public SysDictEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDictEntity 筛选条件
+     * @param pageParam     分页参数
+     * @return PageResult<SysDictEntity> 分页结果
+     */
+
+    public PageResult paging(PageParam pageParam, SysDictEntity sysDictEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysDictEntity)));
+    }
+
+
+    public List obtainDictData(String dictKey) {
+        return sysDictItemService.list(Wrappers.lambdaQuery().eq(SysDictItemEntity::getDictKey, dictKey))
+                .stream().map(it -> BeanUtil.copyProperties(it, ObtainDictDataResult.class))
+                .collect(Collectors.toList());
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/controller/SysDistrictController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/controller/SysDistrictController.java
new file mode 100644
index 0000000..45f5153
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/controller/SysDistrictController.java
@@ -0,0 +1,87 @@
+package com.njzscloud.supervisory.district.controller;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.district.pojo.DistrictTreeResult;
+import com.njzscloud.supervisory.district.pojo.SysDistrictEntity;
+import com.njzscloud.supervisory.district.service.SysDistrictService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 省市区表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_district")
+@RequiredArgsConstructor
+public class SysDistrictController {
+
+    private final SysDistrictService sysDistrictService;
+
+    /**
+     * 新增
+     *
+     * @param sysDistrictEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysDistrictEntity sysDistrictEntity) {
+        sysDistrictService.add(sysDistrictEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDistrictEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysDistrictEntity sysDistrictEntity) {
+        sysDistrictService.modify(sysDistrictEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysDistrictService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDistrictEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysDistrictService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDistrictEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysDistrictEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysDistrictEntity sysDistrictEntity) {
+        return R.success(sysDistrictService.paging(pageParam, sysDistrictEntity));
+    }
+
+    @GetMapping("/tree")
+    public R> tree() {
+        return R.success(sysDistrictService.tree());
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/mapper/SysDistrictMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/mapper/SysDistrictMapper.java
new file mode 100644
index 0000000..37c7c7c
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/mapper/SysDistrictMapper.java
@@ -0,0 +1,32 @@
+package com.njzscloud.supervisory.district.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.district.pojo.DistrictTreeResult;
+import com.njzscloud.supervisory.district.pojo.SysDistrictEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 省市区表
+ */
+@Mapper
+public interface SysDistrictMapper extends BaseMapper {
+
+    @Select("SELECT id,\n" +
+            "       province,\n" +
+            "       city,\n" +
+            "       area,\n" +
+            "       town,\n" +
+            "       IF(tier = 3, 0, pid) pid,\n" +
+            "       tier,\n" +
+            "       district_name,\n" +
+            "       sort\n" +
+            "FROM sys_district\n" +
+            "WHERE tier >= 3 \n" +
+            "AND province = '${province}' \n" +
+            "AND city = '${city}'")
+    List selectByTier(@Param("province") String province, @Param("city") String city);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/DistrictTreeResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/DistrictTreeResult.java
new file mode 100644
index 0000000..1a68238
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/DistrictTreeResult.java
@@ -0,0 +1,64 @@
+package com.njzscloud.supervisory.district.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class DistrictTreeResult {
+
+    /**
+     * Id; 地区代码
+     */
+    private String id;
+
+    /**
+     * 上级地区代码
+     */
+    private String pid;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String area;
+
+    /**
+     * 乡镇街道
+     */
+    private String town;
+
+    /**
+     * 层级; >= 1
+     */
+
+    private Integer tier;
+
+    /**
+     * 地区名称
+     */
+
+    private String districtName;
+
+    /**
+     * 排序
+     */
+
+    private Integer sort;
+
+    private List children;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/SysDistrictEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/SysDistrictEntity.java
new file mode 100644
index 0000000..a19b6ef
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/pojo/SysDistrictEntity.java
@@ -0,0 +1,65 @@
+package com.njzscloud.supervisory.district.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.ToString;
+
+/**
+ * 省市区表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_district")
+public class SysDistrictEntity {
+
+    /**
+     * Id; 地区代码
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 上级地区代码
+     */
+    private String pid;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String area;
+
+    /**
+     * 乡镇街道
+     */
+    private String town;
+
+    /**
+     * 层级; >= 1
+     */
+    private Integer tier;
+
+    /**
+     * 地区名称
+     */
+    private String districtName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/service/SysDistrictService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/service/SysDistrictService.java
new file mode 100644
index 0000000..d033931
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/district/service/SysDistrictService.java
@@ -0,0 +1,84 @@
+package com.njzscloud.supervisory.district.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.tree.Tree;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.district.mapper.SysDistrictMapper;
+import com.njzscloud.supervisory.district.pojo.DistrictTreeResult;
+import com.njzscloud.supervisory.district.pojo.SysDistrictEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 省市区表
+ */
+@Slf4j
+@Service
+public class SysDistrictService extends ServiceImpl implements IService {
+
+    @Value("${app.district.province}")
+    private String province;
+    @Value("${app.district.city}")
+    private String city;
+
+    /**
+     * 新增
+     *
+     * @param sysDistrictEntity 数据
+     */
+    public void add(SysDistrictEntity sysDistrictEntity) {
+        this.save(sysDistrictEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysDistrictEntity 数据
+     */
+    public void modify(SysDistrictEntity sysDistrictEntity) {
+        this.updateById(sysDistrictEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysDistrictEntity 结果
+     */
+    public SysDistrictEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysDistrictEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysDistrictEntity> 分页结果
+     */
+    public PageResult paging(PageParam pageParam, SysDistrictEntity sysDistrictEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysDistrictEntity)));
+    }
+
+    public List tree() {
+        List list = baseMapper.selectByTier(province, city);
+        return Tree.listToTree(list, DistrictTreeResult::getId, DistrictTreeResult::getPid, DistrictTreeResult::setChildren, "0");
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/contant/RequestMethod.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/contant/RequestMethod.java
new file mode 100644
index 0000000..36a2f8b
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/contant/RequestMethod.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.endpoint.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：request_method
+ * 字典名称：HTTP 请求方式
+ */
+@Getter
+@RequiredArgsConstructor
+public enum RequestMethod implements DictStr {
+    GET("GET", "GET 请求"),
+    POST("POST", "POST 请求"),
+    PUT("PUT", "PUT 请求"),
+    DELETE("DELETE", "DELETE 请求");
+
+    private final String val;
+    private final String txt;
+}    
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/controller/SysEndpointController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/controller/SysEndpointController.java
new file mode 100644
index 0000000..51c0bed
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/controller/SysEndpointController.java
@@ -0,0 +1,81 @@
+package com.njzscloud.supervisory.endpoint.controller;
+
+import com.njzscloud.supervisory.endpoint.pojo.SysEndpointEntity;
+import com.njzscloud.supervisory.endpoint.service.SysEndpointService;
+import lombok.extern.slf4j.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+
+import java.util.List;
+
+/**
+ * 端点信息表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_endpoint")
+@RequiredArgsConstructor
+public class SysEndpointController {
+
+    private final SysEndpointService sysEndpointService;
+
+    /**
+     * 新增
+     *
+     * @param sysEndpointEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysEndpointEntity sysEndpointEntity) {
+        sysEndpointService.add(sysEndpointEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysEndpointEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysEndpointEntity sysEndpointEntity) {
+        sysEndpointService.modify(sysEndpointEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysEndpointService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysEndpointEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysEndpointService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysEndpointEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysEndpointEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysEndpointEntity sysEndpointEntity) {
+        return R.success(sysEndpointService.paging(pageParam, sysEndpointEntity));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/mapper/SysEndpointMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/mapper/SysEndpointMapper.java
new file mode 100644
index 0000000..ecd186e
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/mapper/SysEndpointMapper.java
@@ -0,0 +1,16 @@
+package com.njzscloud.supervisory.endpoint.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.endpoint.pojo.SysEndpointEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 端点信息表
+ */
+@Mapper
+public interface SysEndpointMapper extends BaseMapper {
+
+    List listUserEndpoint(Long userId);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/pojo/SysEndpointEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/pojo/SysEndpointEntity.java
new file mode 100644
index 0000000..ff8f95c
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/pojo/SysEndpointEntity.java
@@ -0,0 +1,85 @@
+package com.njzscloud.supervisory.endpoint.pojo;
+
+import com.njzscloud.common.security.contant.EndpointAccessModel;
+import com.njzscloud.supervisory.endpoint.contant.RequestMethod;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+/**
+ * 端点信息表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_endpoint")
+public class SysEndpointEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 请求方式; 字典代码：request_method
+     */
+    private RequestMethod requestMethod;
+
+    /**
+     * 路由前缀; 以 / 开头 或 为空
+     */
+    private String routingPath;
+
+    /**
+     * 端点地址; 以 / 开头, Ant 匹配模式
+     */
+    private String endpointPath;
+
+    /**
+     * 接口访问模式; 字典代码：endpoint_access_model
+     */
+    private EndpointAccessModel accessModel;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 创建人 Id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/service/SysEndpointService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/service/SysEndpointService.java
new file mode 100644
index 0000000..92141df
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/endpoint/service/SysEndpointService.java
@@ -0,0 +1,85 @@
+package com.njzscloud.supervisory.endpoint.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.support.EndpointResource;
+import com.njzscloud.supervisory.endpoint.mapper.SysEndpointMapper;
+import com.njzscloud.supervisory.endpoint.pojo.SysEndpointEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 端点信息表
+ */
+@Slf4j
+@Service
+public class SysEndpointService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysEndpointEntity 数据
+     */
+    public void add(SysEndpointEntity sysEndpointEntity) {
+        this.save(sysEndpointEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysEndpointEntity 数据
+     */
+    public void modify(SysEndpointEntity sysEndpointEntity) {
+        this.updateById(sysEndpointEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysEndpointEntity 结果
+     */
+    public SysEndpointEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysEndpointEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysEndpointEntity> 分页结果
+     */
+    public PageResult paging(PageParam pageParam, SysEndpointEntity sysEndpointEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysEndpointEntity)));
+    }
+
+    public List listUserEndpoint(Long userId) {
+        List sysMenuEntities = baseMapper.listUserEndpoint(userId);
+        return sysMenuEntities.stream()
+                .map(it -> BeanUtil.copyProperties(it, EndpointResource.class)
+                        .setAccessModel(it.getAccessModel().getVal())
+                        .setRequestMethod(it.getRequestMethod().getVal())
+
+                )
+                .collect(Collectors.toList());
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/contant/MenuCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/contant/MenuCategory.java
new file mode 100644
index 0000000..792b769
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/contant/MenuCategory.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.menu.contant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import com.njzscloud.common.core.ienum.DictStr;
+
+/**
+ * 菜单类型
+ */
+@Getter
+@RequiredArgsConstructor
+public enum MenuCategory implements DictStr {
+    Catalog("Catalog", "目录"),
+    Group("Group", "组"),
+    Page("Page", "页面"),
+    SubPage("SubPage", "子页面"),
+    Btn("Btn", "按钮");
+
+    private final String val;
+    private final String txt;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/controller/SysMenuController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/controller/SysMenuController.java
new file mode 100644
index 0000000..adaa247
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/controller/SysMenuController.java
@@ -0,0 +1,97 @@
+package com.njzscloud.supervisory.menu.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.supervisory.menu.pojo.MenuAddParam;
+import com.njzscloud.supervisory.menu.pojo.MenuDetailResult;
+import com.njzscloud.supervisory.menu.pojo.MenuModifyParam;
+import com.njzscloud.supervisory.menu.pojo.MenuSearchParam;
+import com.njzscloud.supervisory.menu.service.SysMenuService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 菜单
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_menu")
+@RequiredArgsConstructor
+public class SysMenuController {
+
+    private final SysMenuService sysMenuService;
+
+    /**
+     * 新增

+     *
+     * @param menuAddParam 数据
+     * @required
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody @Validated MenuAddParam menuAddParam) {
+        return R.success(sysMenuService.add(menuAddParam));
+    }
+
+    /**
+     * 修改
+     *
+     * @param menuModifyParam 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody @Validated MenuModifyParam menuModifyParam) {
+        sysMenuService.modify(menuModifyParam);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Id
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        Assert.notEmpty(ids, "未指定要删除的数据");
+        sysMenuService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysMenuVO 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysMenuService.detail(id));
+    }
+
+    /**
+     * 查询
+     */
+    @GetMapping("/list")
+    public R> list(@RequestParam(required = false) Long pid, MenuSearchParam menuSearchParam) {
+        return R.success(sysMenuService.list(pid, menuSearchParam));
+    }
+
+    /**
+     * 查询
+     */
+    @GetMapping("/page_list")
+    public R> pageList(PageParam pageParam, MenuSearchParam menuSearchParam) {
+        return R.success(sysMenuService.pageList(pageParam.toPage(), menuSearchParam));
+    }
+
+    @GetMapping("/user_menu")
+    public R> listUserMenu(@RequestParam Long userId) {
+        return R.success(sysMenuService.listUserMenu(userId));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/mapper/SysMenuMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/mapper/SysMenuMapper.java
new file mode 100644
index 0000000..c5d9946
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/mapper/SysMenuMapper.java
@@ -0,0 +1,15 @@
+package com.njzscloud.supervisory.menu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.menu.pojo.SysMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 菜单信息表
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper {
+    List selectMenuByUserId(Long userId);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuAddParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuAddParam.java
new file mode 100644
index 0000000..f6c906f
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuAddParam.java
@@ -0,0 +1,74 @@
+package com.njzscloud.supervisory.menu.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.supervisory.menu.contant.MenuCategory;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 添加菜单
+ */
+@Getter
+@Setter
+@Constraint
+public class MenuAddParam implements Constrained {
+    /**
+     * 上级 Id; 层级为 1 的节点值为 0
+     */
+    private Long pid;
+
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空")
+    private String title;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 类型; 字典代码：menu_category
+     */
+    private MenuCategory menuCategory;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+
+    private String sn;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> pid == null || pid >= 0, "上级 Id 必须大于 0 或不指定"),
+                ValidRule.of(() -> menuCategory != null, "类型不能为空"),
+                ValidRule.of(() -> {
+                    if ((menuCategory == MenuCategory.Catalog || menuCategory == MenuCategory.Btn)) {
+                        return StrUtil.isBlank(routeName);
+                    } else {
+                        return true;
+                    }
+                }, "菜单目录和按钮不用指定路由名称"),
+                ValidRule.of(() -> {
+                    if (menuCategory == MenuCategory.Page || menuCategory == MenuCategory.SubPage) {
+                        return StrUtil.isNotBlank(routeName);
+                    } else {
+                        return true;
+                    }
+                }, "路由名称不能为空"),
+        };
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuDetailResult.java
new file mode 100644
index 0000000..0e3c846
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuDetailResult.java
@@ -0,0 +1,57 @@
+package com.njzscloud.supervisory.menu.pojo;
+
+import com.njzscloud.supervisory.menu.contant.MenuCategory;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 添加菜单
+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+@Accessors(chain = true)
+public class MenuDetailResult {
+
+    /**
+     * 主键 Id
+     */
+    private Long id;
+
+    /**
+     * 上级 Id; 层级为 1 的节点值为 0
+     */
+    private Long pid;
+    private Integer tier;
+
+    /**
+     * 菜单名称
+     */
+    private String title;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 类型; 字典代码：menu_category
+     */
+    private MenuCategory menuCategory;
+
+    private List breadcrumb;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuModifyParam.java
new file mode 100644
index 0000000..76d9447
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuModifyParam.java
@@ -0,0 +1,56 @@
+package com.njzscloud.supervisory.menu.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+
+/**
+ * 添加菜单
+ */
+@Getter
+@Setter
+@Constraint
+@Accessors(chain = true)
+public class MenuModifyParam implements Constrained {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 上级 Id; 层级为 1 的节点值为 0
+     */
+    private Long pid;
+
+    /**
+     * 菜单名称
+     */
+    private String title;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> id != null, "未知定要修改的菜单"),
+                ValidRule.of(() -> pid == null || pid >= 0, "上级 Id 必须大于 0 或不指定"),
+        };
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuSearchParam.java
new file mode 100644
index 0000000..df42817
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/MenuSearchParam.java
@@ -0,0 +1,27 @@
+package com.njzscloud.supervisory.menu.pojo;
+
+import com.njzscloud.common.mvc.validator.Constraint;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * 添加菜单
+ */
+@Getter
+@Setter
+@Constraint
+@Accessors(chain = true)
+public class MenuSearchParam {
+
+    /**
+     * 菜单名称
+     */
+    private String title;
+
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/SysMenuEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/SysMenuEntity.java
new file mode 100644
index 0000000..963b6d2
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/pojo/SysMenuEntity.java
@@ -0,0 +1,100 @@
+package com.njzscloud.supervisory.menu.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
+import com.njzscloud.supervisory.menu.contant.MenuCategory;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 菜单信息表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName(value = "sys_menu", autoResultMap = true)
+public class SysMenuEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    private String sn;
+    /**
+     * 上级 Id; 层级为 1 的节点值为 0
+     */
+    private Long pid;
+
+    /**
+     * 菜单名称
+     */
+    private String title;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 层级; >= 1
+     */
+    private Integer tier;
+
+    /**
+     * 面包路径; 逗号分隔
+     */
+    @TableField(value = "breadcrumb", typeHandler = JsonTypeHandler.class)
+    private List breadcrumb;
+
+    /**
+     * 类型; 字典代码：menu_category
+     */
+    private MenuCategory menuCategory;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 路由名称
+     */
+    private String routeName;
+
+    /**
+     * 创建人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java
new file mode 100644
index 0000000..49d5c04
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java
@@ -0,0 +1,199 @@
+package com.njzscloud.supervisory.menu.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.supervisory.menu.contant.MenuCategory;
+import com.njzscloud.supervisory.menu.mapper.SysMenuMapper;
+import com.njzscloud.supervisory.menu.pojo.*;
+import com.njzscloud.supervisory.resource.pojo.SysResourceEntity;
+import com.njzscloud.supervisory.resource.service.SysResourceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 
sys_menu

+ * 
菜单信息表

+ */
+@Slf4j
+@Service
+public class SysMenuService extends ServiceImpl implements IService {
+
+    @Autowired
+    private SysResourceService sysResourceService;
+
+    /**
+     * 新增
+     *
+     * @param menuAddParam 数据
+     * @return
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long add(MenuAddParam menuAddParam) {
+        String sn = menuAddParam.getSn();
+        boolean exists = this.exists(Wrappers.lambdaQuery().eq(SysMenuEntity::getSn, sn));
+        Assert.isFalse(exists, () -> Exceptions.exception("资源编码重复"));
+        SysMenuEntity sysMenuEntity = BeanUtil.copyProperties(menuAddParam, SysMenuEntity.class);
+        Long pid = sysMenuEntity.getPid();
+        if (pid == null) {
+            sysMenuEntity.setPid(0L);
+            pid = 0L;
+        }
+        String title = sysMenuEntity.getTitle();
+        if (pid == 0) {
+            sysMenuEntity.setTier(1);
+            sysMenuEntity.setBreadcrumb(CollUtil.newArrayList(title));
+        } else {
+            SysMenuEntity parent = this.getById(pid);
+            Assert.notNull(parent, () -> Exceptions.exception("上级菜单不存在"));
+            sysMenuEntity.setTier(parent.getTier() + 1);
+            List breadcrumb = parent.getBreadcrumb();
+            breadcrumb.add(title);
+            sysMenuEntity.setBreadcrumb(breadcrumb);
+        }
+        this.save(sysMenuEntity);
+        Long sysMenuEntityId = sysMenuEntity.getId();
+        exists = sysResourceService.exists(Wrappers.lambdaQuery().eq(SysResourceEntity::getSn, sn));
+        Assert.isFalse(exists, () -> Exceptions.exception("资源编码重复"));
+        sysResourceService.save(new SysResourceEntity()
+                .setSn(sn)
+                .setDataId(sysMenuEntityId)
+                .setTableName("sys_menu")
+                .setMemo("菜单资源-" + menuAddParam.getMenuCategory().getTxt() + "-" + menuAddParam.getTitle())
+        );
+        return sysMenuEntityId;
+    }
+
+    /**
+     * 修改
+     *
+     * @param menuModifyParam 数据
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void modify(MenuModifyParam menuModifyParam) {
+        SysMenuEntity sysMenuEntity = BeanUtil.copyProperties(menuModifyParam, SysMenuEntity.class);
+        Long id = sysMenuEntity.getId();
+        Long pid = sysMenuEntity.getPid();
+        SysMenuEntity oldSysMenuEntity = this.getById(id);
+        Assert.notNull(oldSysMenuEntity, () -> Exceptions.exception("菜单不存在"));
+        MenuCategory menuCategory = oldSysMenuEntity.getMenuCategory();
+        String routeName = sysMenuEntity.getRouteName();
+
+        if (menuCategory == MenuCategory.Page || menuCategory == MenuCategory.SubPage && routeName != null) {
+            Assert.notBlank(routeName, () -> Exceptions.exception("路由名称不能为空"));
+        } else if (menuCategory == MenuCategory.Catalog || menuCategory == MenuCategory.Btn && routeName != null) {
+            Assert.isTrue(StrUtil.isBlank(routeName), () -> Exceptions.exception("菜单目录和按钮不用指定路由名称"));
+        }
+
+        if (pid != null && !pid.equals(oldSysMenuEntity.getPid()) && menuCategory == MenuCategory.Catalog) {
+            SysMenuEntity parent = this.getById(pid);
+            String title = sysMenuEntity.getTitle();
+            List breadcrumb = parent.getBreadcrumb();
+            breadcrumb.add(StrUtil.isBlank(title) ? oldSysMenuEntity.getTitle() : title);
+            sysMenuEntity.setBreadcrumb(breadcrumb)
+                    .setTier(parent.getTier() + 1);
+
+            this.modifyChild(sysMenuEntity);
+        }
+
+        this.updateById(sysMenuEntity);
+
+        String title = menuModifyParam.getTitle();
+        if (StrUtil.isBlank(title)) return;
+        sysResourceService.update(Wrappers.lambdaUpdate()
+                .eq(SysResourceEntity::getTableName, "sys_menu")
+                .eq(SysResourceEntity::getDataId, id)
+                .set(SysResourceEntity::getMemo, "菜单资源-" + oldSysMenuEntity.getMenuCategory().getTxt() + "-" + title));
+    }
+
+    private void modifyChild(SysMenuEntity sysMenuEntity) {
+        List breadcrumb = sysMenuEntity.getBreadcrumb();
+        int tier = sysMenuEntity.getTier() + 1;
+        this.list(Wrappers.lambdaQuery().eq(SysMenuEntity::getPid, sysMenuEntity.getId()))
+                .stream()
+                .map(it -> {
+                    List temp = CollUtil.newArrayList(breadcrumb);
+                    temp.add(it.getTitle());
+                    return new SysMenuEntity()
+                            .setId(it.getId())
+                            .setBreadcrumb(temp)
+                            .setTier(tier);
+                })
+                .forEach(this::modifyChild);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Id
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+        sysResourceService.remove(Wrappers.lambdaQuery()
+                .eq(SysResourceEntity::getTableName, "sys_menu")
+                .in(SysResourceEntity::getDataId, ids)
+        );
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysMenuListVO 结果
+     */
+
+    public MenuDetailResult detail(Long id) {
+        return BeanUtil.copyProperties(this.getById(id), MenuDetailResult.class);
+    }
+
+
+    public List list(Long pid, MenuSearchParam menuSearchParam) {
+        String title = menuSearchParam.getTitle();
+        String routeName = menuSearchParam.getRouteName();
+        return this.list(Wrappers.lambdaQuery()
+                        .eq(pid != null, SysMenuEntity::getPid, pid)
+                        .like(StrUtil.isNotBlank(title), SysMenuEntity::getTitle, title)
+                        .like(StrUtil.isNotBlank(routeName), SysMenuEntity::getRouteName, routeName)
+                        .orderByAsc(Arrays.asList(SysMenuEntity::getTier, SysMenuEntity::getSort)))
+                .stream()
+                .map(it -> BeanUtil.copyProperties(it, MenuDetailResult.class))
+                .collect(Collectors.toList());
+    }
+
+    public List listUserMenu(Long userId) {
+        List sysMenuEntities = baseMapper.selectMenuByUserId(userId);
+        return sysMenuEntities.stream()
+                .map(it -> BeanUtil.copyProperties(it, MenuResource.class)
+                        .setMenuCategory(it.getMenuCategory().getVal())
+                )
+                .collect(Collectors.toList());
+    }
+
+
+    public PageResult pageList(IPage page, MenuSearchParam menuSearchParam) {
+        String title = menuSearchParam.getTitle();
+        String routeName = menuSearchParam.getRouteName();
+        page = this.page(page, Wrappers.lambdaQuery()
+                .like(StrUtil.isNotBlank(title), SysMenuEntity::getTitle, title)
+                .like(StrUtil.isNotBlank(routeName), SysMenuEntity::getRouteName, routeName));
+        return PageResult.of(page.convert(it -> BeanUtil.copyProperties(it, MenuDetailResult.class)));
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/oss/controller/OSSController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/oss/controller/OSSController.java
new file mode 100644
index 0000000..a6a98a4
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/oss/controller/OSSController.java
@@ -0,0 +1,86 @@
+package com.njzscloud.supervisory.oss.controller;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.core.http.constant.Mime;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mvc.util.FileResponseUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+
+// @RestController
+// @RequestMapping("/oss")
+public class OSSController {
+
+    @Value("${oss.path}")
+    private String path;
+
+    @GetMapping("/end_mlt_upload")
+    public R endMltUpload(String objectName, String uploadId, int partNum) {
+        // Minio.endMltUpload(objectName, uploadId, partNum);
+        return R.success();
+    }
+
+    @GetMapping("/start_mlt_upload")
+    public R>> startMltUpload(
+            String objectName,
+            String contentType,
+            int partNum) {
+        // Minio.startMltUpload(objectName, contentType, partNum)
+        return R.success();
+    }
+
+    @GetMapping("/obtain_presigned_url")
+    public R> obtainPresignedUrl(
+            @RequestParam(value = "bucketName") String bucketName,
+            @RequestParam(value = "filename") String filename) {
+        String objectName = IdUtil.fastSimpleUUID();
+        if (StrUtil.isNotBlank(filename)) {
+            objectName = objectName + "." + FileUtil.extName(filename);
+        }
+        // Map data = Minio.obtainPresignedUrl(bucketName, objectName);
+        return R.success();
+    }
+
+    @GetMapping("/download/{bucketName}/{objectName}")
+    public void obtainFile(
+            @PathVariable("bucketName") String bucketName,
+            @PathVariable("objectName") String objectName,
+            HttpServletResponse response) throws Exception {
+        // Tuple2 tuple2 = Minio.obtainFile(bucketName, objectName);
+        File file = new File(path + "/" + bucketName + "/" + objectName);
+        if (!file.exists()) {
+            response.sendError(404);
+            return;
+        }
+        FileInputStream inputStream = new FileInputStream(file);
+        FileResponseUtil.download(response, inputStream, Mime.BINARY, objectName);
+    }
+
+    @PostMapping("/upload")
+    public R upload(@RequestPart("file") MultipartFile file) throws Exception {
+        String filename = file.getOriginalFilename();
+        String objectName = IdUtil.fastSimpleUUID();
+        if (StrUtil.isNotBlank(filename)) {
+            objectName = objectName + "." + FileUtil.extName(filename);
+        }
+        InputStream inputStream = file.getInputStream();
+        IoUtil.copy(inputStream, Files.newOutputStream(Paths.get(path + "/test/" + objectName)));
+        inputStream.close();
+
+        return R.success("download/test/" + objectName);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/cotroller/SysResourceController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/cotroller/SysResourceController.java
new file mode 100644
index 0000000..7021790
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/cotroller/SysResourceController.java
@@ -0,0 +1,95 @@
+package com.njzscloud.supervisory.resource.cotroller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.njzscloud.supervisory.resource.pojo.SysResourceEntity;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.resource.service.SysResourceService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统资源表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_resource")
+@RequiredArgsConstructor
+public class SysResourceController {
+
+    private final SysResourceService sysResourceService;
+
+    /**
+     * 新增
+     *
+     * @param sysResourceEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysResourceEntity sysResourceEntity) {
+        sysResourceService.add(sysResourceEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysResourceEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysResourceEntity sysResourceEntity) {
+        sysResourceService.modify(sysResourceEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysResourceService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysResourceEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysResourceService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysResourceEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysResourceEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysResourceEntity sysResourceEntity) {
+        return R.success(sysResourceService.paging(pageParam, sysResourceEntity));
+    }
+
+    @GetMapping("/list")
+    public R> list(
+            @RequestParam(value = "tableName", required = false) String tableName,
+            @RequestParam(value = "keywords", required = false) String keywords
+    ) {
+        return R.success(sysResourceService.list(Wrappers.lambdaQuery()
+                .eq(StrUtil.isNotBlank(tableName), SysResourceEntity::getTableName, tableName)
+                .and(StrUtil.isNotBlank(keywords), ew -> ew.like(SysResourceEntity::getSn, keywords)
+                        .or().like(SysResourceEntity::getMemo, keywords))
+        ));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/mapper/SysResourceMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/mapper/SysResourceMapper.java
new file mode 100644
index 0000000..4ca407d
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/mapper/SysResourceMapper.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.resource.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.common.security.support.EndpointResource;
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.supervisory.resource.pojo.SysResourceEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 系统资源表
+ */
+@Mapper
+public interface SysResourceMapper extends BaseMapper {
+
+    List listUserMenu(@Param("userId") Long userId);
+
+    List listUserEndpoint(@Param("userId") Long userId);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/pojo/SysResourceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/pojo/SysResourceEntity.java
new file mode 100644
index 0000000..267f616
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/pojo/SysResourceEntity.java
@@ -0,0 +1,43 @@
+package com.njzscloud.supervisory.resource.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 系统资源表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_resource")
+public class SysResourceEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String sn;
+
+    /**
+     * 表名称
+     */
+    private String tableName;
+
+    /**
+     * 数据行 Id
+     */
+    private Long dataId;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/service/SysResourceService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/service/SysResourceService.java
new file mode 100644
index 0000000..e294431
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/resource/service/SysResourceService.java
@@ -0,0 +1,89 @@
+package com.njzscloud.supervisory.resource.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.support.EndpointResource;
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.common.security.support.Resource;
+import com.njzscloud.supervisory.resource.mapper.SysResourceMapper;
+import com.njzscloud.supervisory.resource.pojo.SysResourceEntity;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 系统资源表
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysResourceService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysResourceEntity 数据
+     */
+
+    public void add(SysResourceEntity sysResourceEntity) {
+        this.save(sysResourceEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysResourceEntity 数据
+     */
+
+    public void modify(SysResourceEntity sysResourceEntity) {
+        this.updateById(sysResourceEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysResourceEntity 结果
+     */
+
+    public SysResourceEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysResourceEntity 筛选条件
+     * @param pageParam         分页参数
+     * @return PageResult<SysResourceEntity> 分页结果
+     */
+
+    public PageResult paging(PageParam pageParam, SysResourceEntity sysResourceEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery(sysResourceEntity)));
+    }
+
+    public Resource selectResourceByUserId(Long userId) {
+        List menuResources = baseMapper.listUserMenu(userId);
+        List endpointResource = baseMapper.listUserEndpoint(userId);
+        return new Resource()
+                .setMenu(menuResources)
+                .setEndpoint(endpointResource);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/controller/SysRoleController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/controller/SysRoleController.java
new file mode 100644
index 0000000..f79e5de
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/controller/SysRoleController.java
@@ -0,0 +1,115 @@
+package com.njzscloud.supervisory.role.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.supervisory.role.service.SysRoleService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import com.njzscloud.supervisory.role.pojo.RoleBindResourceParam;
+import com.njzscloud.supervisory.role.pojo.RoleAddParam;
+import com.njzscloud.supervisory.role.pojo.RoleModifyParam;
+import com.njzscloud.supervisory.role.pojo.RoleQueryParam;
+import com.njzscloud.supervisory.menu.pojo.MenuDetailResult;
+import com.njzscloud.supervisory.role.pojo.RoleDetailResult;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 角色
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_role")
+@RequiredArgsConstructor
+public class SysRoleController {
+
+    private final SysRoleService sysRoleService;
+
+    /**
+     * 绑定菜单
+     */
+    @PostMapping("/bind_menu")
+    public R bindMenu(@RequestBody RoleBindResourceParam roleBindResourceParam) {
+        sysRoleService.bindMenu(roleBindResourceParam);
+        return R.success();
+    }
+
+    /**
+     * 查询角色拥有的菜单
+     *
+     * @param roleId 角色 Id
+     * @return 菜单列表
+     */
+    @GetMapping("/owned_menu")
+    public R> ownedMenu(@RequestParam Long roleId) {
+        return R.success(sysRoleService.ownedMenu(roleId));
+    }
+
+    /**
+     * 新增
+     *
+     * @param roleAddParam 数据
+     * @return Long
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody @Validated RoleAddParam roleAddParam) {
+        return R.success(sysRoleService.add(roleAddParam));
+    }
+
+    /**
+     * 修改
+     *
+     * @param roleModifyParam 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody RoleModifyParam roleModifyParam) {
+        sysRoleService.modify(roleModifyParam);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Id
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        Assert.notEmpty(ids, "未指定要删除的数据");
+        sysRoleService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return RoleDetailResult 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysRoleService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param roleQueryParam 筛选条件
+     * @param page           分页参数
+     * @return PageResult<RoleDetailResult> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam page, RoleQueryParam roleQueryParam) {
+        return R.success(sysRoleService.paging(page.toPage(), roleQueryParam));
+    }
+
+    @GetMapping("/user_role")
+    public R> listUserRole(@RequestParam Long userId) {
+        return R.success(sysRoleService.listUserRole(userId));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleMapper.java
new file mode 100644
index 0000000..9bea9e5
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleMapper.java
@@ -0,0 +1,31 @@
+package com.njzscloud.supervisory.role.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Set;
+
+/**
+ * 
sys_role

+ * 
角色表

+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper {
+
+    /**
+     * 分页查询
+     *
+     * @param page 分页参数
+     * @param ew   查询条件
+     * @return IPage<SysRoleEntity> 分页结果
+     */
+    IPage paging(IPage page, @Param(Constants.WRAPPER) Wrapper ew);
+
+    Set selectRoleByUserId(Long userId);
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleResMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleResMapper.java
new file mode 100644
index 0000000..364e23e
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/mapper/SysRoleResMapper.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.role.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.role.pojo.SysRoleResourceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 角色-资源关系表
+ */
+@Mapper
+public interface SysRoleResMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleAddParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleAddParam.java
new file mode 100644
index 0000000..8a7acb1
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleAddParam.java
@@ -0,0 +1,32 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class RoleAddParam {
+    /**
+     * 角色代码
+     */
+    @NotBlank(message = "角色代码不能为空")
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空")
+    private String roleName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    private List resIds;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleBindResourceParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleBindResourceParam.java
new file mode 100644
index 0000000..4672478
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleBindResourceParam.java
@@ -0,0 +1,24 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class RoleBindResourceParam {
+    /**
+     * 角色 Id
+     */
+    private Long roleId;
+
+    /**
+     * 资源列表
+     */
+    private List resIds;
+
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleDetailResult.java
new file mode 100644
index 0000000..67783fa
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleDetailResult.java
@@ -0,0 +1,40 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 
sys_role

+ * 
角色表

+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+public class RoleDetailResult {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 角色代码; 以 ROLE_ 开头
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    private List resIds;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleModifyParam.java
new file mode 100644
index 0000000..28f65d7
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleModifyParam.java
@@ -0,0 +1,34 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class RoleModifyParam {
+    @NotNull(message = "Id 不能为空")
+    private Long id;
+
+    /**
+     * 角色代码
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    private List resIds;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleQueryParam.java
new file mode 100644
index 0000000..9d9d2e0
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/RoleQueryParam.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class RoleQueryParam {
+    /**
+     * 角色代码
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleEntity.java
new file mode 100644
index 0000000..9aa06f1
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleEntity.java
@@ -0,0 +1,70 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 角色表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_role")
+public class SysRoleEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 角色代码; 以 ROLE_ 开头
+     */
+    private String roleCode;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 创建人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleResourceEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleResourceEntity.java
new file mode 100644
index 0000000..9599c98
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/pojo/SysRoleResourceEntity.java
@@ -0,0 +1,49 @@
+package com.njzscloud.supervisory.role.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.*;
+
+/**
+ * 角色-资源关系表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_role_resource")
+public class SysRoleResourceEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 角色 Id; sys_role.id
+     */
+    private Long roleId;
+
+    /**
+     * 资源 Id; sys_resource.id
+     */
+    private Long resId;
+
+    /**
+     * 资源编码; sys_resource.sn
+     */
+    private String resSn;
+
+
+    /**
+     * 表名称
+     */
+    private String tableName;
+
+    /**
+     * 数据行 Id
+     */
+    private Long dataId;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleResService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleResService.java
new file mode 100644
index 0000000..b76cfc0
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleResService.java
@@ -0,0 +1,77 @@
+package com.njzscloud.supervisory.role.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.role.mapper.SysRoleResMapper;
+import com.njzscloud.supervisory.role.pojo.SysRoleResourceEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 角色-资源关系表
+ */
+@Slf4j
+@Service
+public class SysRoleResService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysRoleResourceEntity 数据
+     */
+
+    public void add(SysRoleResourceEntity sysRoleResourceEntity) {
+        this.save(sysRoleResourceEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysRoleResourceEntity 数据
+     */
+
+    public void modify(SysRoleResourceEntity sysRoleResourceEntity) {
+        this.updateById(sysRoleResourceEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysRoleResourceEntity 结果
+     */
+
+    public SysRoleResourceEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysRoleResourceEntity 筛选条件
+     * @param pageParam             分页参数
+     * @return PageResult<SysRoleResourceEntity> 分页结果
+     */
+
+    public PageResult paging(PageParam pageParam, SysRoleResourceEntity sysRoleResourceEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysRoleResourceEntity)));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleService.java
new file mode 100644
index 0000000..5d66879
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/role/service/SysRoleService.java
@@ -0,0 +1,189 @@
+package com.njzscloud.supervisory.role.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.core.utils.GroupUtil;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.menu.pojo.MenuDetailResult;
+import com.njzscloud.supervisory.menu.service.SysMenuService;
+import com.njzscloud.supervisory.resource.pojo.SysResourceEntity;
+import com.njzscloud.supervisory.resource.service.SysResourceService;
+import com.njzscloud.supervisory.role.mapper.SysRoleMapper;
+import com.njzscloud.supervisory.role.pojo.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 角色表
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysRoleService extends ServiceImpl implements IService {
+
+    private final SysRoleResService sysRoleResService;
+    private final SysResourceService sysResourceService;
+
+    private final SysMenuService sysMenuService;
+
+    /**
+     * 新增
+     *
+     * @param roleAddParam 数据
+     * @return Long
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long add(RoleAddParam roleAddParam) {
+        SysRoleEntity sysRoleEntity = BeanUtil.copyProperties(roleAddParam, SysRoleEntity.class);
+        String roleCode = sysRoleEntity.getRoleCode();
+        if (!roleCode.startsWith("ROLE_")) {
+            roleCode = "ROLE_" + roleCode;
+            sysRoleEntity.setRoleCode(roleCode);
+        }
+        boolean exists = this.exists(Wrappers.lambdaQuery().eq(SysRoleEntity::getRoleCode, roleCode));
+        Assert.isFalse(exists, "角色编码：{} 已存在", roleCode);
+        this.save(sysRoleEntity);
+        Long roleEntityId = sysRoleEntity.getId();
+        List resIds = roleAddParam.getResIds();
+        if (CollUtil.isNotEmpty(resIds)) bindMenu(new RoleBindResourceParam().setRoleId(roleEntityId).setResIds(resIds));
+        return roleEntityId;
+    }
+
+    /**
+     * 修改
+     *
+     * @param roleModifyParam 数据
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void modify(RoleModifyParam roleModifyParam) {
+        SysRoleEntity sysRoleEntity = BeanUtil.copyProperties(roleModifyParam, SysRoleEntity.class);
+        this.updateById(sysRoleEntity);
+        List resIds = roleModifyParam.getResIds();
+        if (CollUtil.isNotEmpty(resIds))
+            bindMenu(new RoleBindResourceParam().setRoleId(roleModifyParam.getId()).setResIds(resIds));
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Id
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return RoleDetailResult 结果
+     */
+
+    public RoleDetailResult detail(Long id) {
+        SysRoleEntity sysRoleEntity = this.getById(id);
+        List list = sysRoleResService.list(Wrappers.lambdaQuery().eq(SysRoleResourceEntity::getRoleId, id));
+        List resIds = list.stream().map(SysRoleResourceEntity::getResId).collect(Collectors.toList());
+        return BeanUtil.copyProperties(sysRoleEntity, RoleDetailResult.class)
+                .setResIds(resIds);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param page           分页参数
+     * @param roleQueryParam 筛选条件
+     * @return PageResult<RoleDetailResult> 分页结果
+     */
+
+    public PageResult paging(IPage page, RoleQueryParam roleQueryParam) {
+        String roleCode = roleQueryParam.getRoleCode();
+        String roleName = roleQueryParam.getRoleName();
+        Wrapper ew = Wrappers.lambdaQuery()
+                .like(roleCode != null, SysRoleEntity::getRoleCode, roleCode)
+                .like(roleName != null, SysRoleEntity::getRoleName, roleName);
+        return PageResult.of(baseMapper.paging(page, ew).convert(it -> BeanUtil.copyProperties(it, RoleDetailResult.class)));
+    }
+
+    /**
+     * 绑定菜单
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void bindMenu(RoleBindResourceParam roleBindResourceParam) {
+        Long roleId = roleBindResourceParam.getRoleId();
+        boolean exists = this.exists(Wrappers.lambdaQuery().eq(SysRoleEntity::getId, roleId));
+        Assert.isTrue(exists, () -> Exceptions.exception("角色不存在"));
+        List resIds = roleBindResourceParam.getResIds();
+
+        List sysMenuEntities = sysResourceService.listByIds(resIds);
+        Assert.isTrue(sysMenuEntities.size() == resIds.size(), () -> Exceptions.exception("资源不存在"));
+
+        List oldResIds = sysRoleResService.list(Wrappers.lambdaQuery().eq(SysRoleResourceEntity::getRoleId, roleId))
+                .stream().map(SysRoleResourceEntity::getResId).collect(Collectors.toList());
+
+
+        Collection delResIds = CollUtil.subtract(oldResIds, resIds);
+        if (CollUtil.isNotEmpty(delResIds)) {
+            sysRoleResService.remove(Wrappers.lambdaQuery().eq(SysRoleResourceEntity::getRoleId, roleId).in(SysRoleResourceEntity::getResId, delResIds));
+        }
+        Map map = GroupUtil.k_o(sysMenuEntities, SysResourceEntity::getId);
+        List addRelations = CollUtil.subtract(resIds, oldResIds)
+                .stream().map(it -> {
+                    SysResourceEntity sysResourceEntity = map.get(it);
+                    return new SysRoleResourceEntity()
+                            .setRoleId(roleId)
+                            .setResId(it)
+                            .setResSn(sysResourceEntity.getSn())
+                            .setTableName(sysResourceEntity.getTableName())
+                            .setDataId(sysResourceEntity.getDataId());
+                })
+                .collect(Collectors.toList());
+
+        if (CollUtil.isEmpty(addRelations)) return;
+        sysRoleResService.saveBatch(addRelations);
+    }
+
+    /**
+     * 查询角色拥有的菜单
+     *
+     * @param roleId 角色 Id
+     * @return 菜单列表
+     */
+
+    public List ownedMenu(Long roleId) {
+        List sysRoleResourceEntities = sysRoleResService.list(Wrappers.lambdaQuery()
+                .eq(SysRoleResourceEntity::getRoleId, roleId)
+                .eq(SysRoleResourceEntity::getTableName, "sys_menu")
+        );
+        if (CollUtil.isNotEmpty(sysRoleResourceEntities)) {
+            List menuIds = sysRoleResourceEntities.stream().map(SysRoleResourceEntity::getResId).collect(Collectors.toList());
+            return sysMenuService.listByIds(menuIds)
+                    .stream()
+                    .map(it -> BeanUtil.copyProperties(it, MenuDetailResult.class))
+                    .collect(Collectors.toList());
+        }
+        return Collections.emptyList();
+    }
+
+
+    public Set listUserRole(Long userId) {
+        return baseMapper.selectRoleByUserId(userId);
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/contant/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/contant/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/StatisticsController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/StatisticsController.java
new file mode 100644
index 0000000..c166450
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/controller/StatisticsController.java
@@ -0,0 +1,32 @@
+package com.njzscloud.supervisory.statistics.controller;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.supervisory.statistics.service.StatisticsService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/statistics")
+@CrossOrigin
+@RequiredArgsConstructor
+public class StatisticsController {
+    private final StatisticsService statisticsService;
+
+    @GetMapping("/obtain_data")
+    public R obtainData() throws Exception {
+        long l = System.currentTimeMillis();
+        Map data = statisticsService.obtainData();
+        System.out.println("耗时: " + (System.currentTimeMillis() - l));
+        return R.success(data);
+    }
+
+    @GetMapping("/obtain_order")
+    public R obtainOrder(Long userId) {
+        return R.success(statisticsService.obtainOrder(userId));
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/StatisticsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/StatisticsMapper.java
new file mode 100644
index 0000000..3ecdb00
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/StatisticsMapper.java
@@ -0,0 +1,29 @@
+package com.njzscloud.supervisory.statistics.mapper;
+
+import com.njzscloud.supervisory.statistics.pojo.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface StatisticsMapper {
+
+    List getCarTrends();
+
+    UserSummary getUserSummary();
+
+    List getGarbageDisposeSummary();
+
+    List getCurrentMonthGarbageDisposeSummary();
+
+    List getOrderSummary();
+
+    TodayOrderSummary getTodayOrderSummary();
+
+    List obtainOrder(@Param("userId") Long userId);
+
+    Double disposeWeight(@Param("startTime") Long startTime, @Param("endTime") Long endTime);
+
+    List getOrderAmountSummary(@Param("startTime") Long startTime, @Param("endTime") Long endTime);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/CarTrends.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/CarTrends.java
new file mode 100644
index 0000000..3c2fbcd
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/CarTrends.java
@@ -0,0 +1,18 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class CarTrends {
+    private String carNumber;
+    private String weight;
+    private String orderStatus;
+    private String stationId;
+    private String stationName;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java
new file mode 100644
index 0000000..25e21cb
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java
@@ -0,0 +1,18 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class GarbageDisposeSummary {
+    private String garbageName;
+    private Double weight;
+    private Integer depotType;
+    private String  depotName;
+    private Double percentage;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderAmountSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderAmountSummary.java
new file mode 100644
index 0000000..841b948
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderAmountSummary.java
@@ -0,0 +1,18 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class OrderAmountSummary {
+    private Integer amount;
+    private Date outTime;
+    private Integer cd;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderInfo.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderInfo.java
new file mode 100644
index 0000000..c6912b9
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderInfo.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class OrderInfo {
+    private String carNumber;
+    private String goodsName;
+    private String orderStatus;
+    private Double weight;
+    private LocalDateTime inTime;
+    private LocalDateTime outTime;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderSummary.java
new file mode 100644
index 0000000..989607c
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/OrderSummary.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class OrderSummary {
+    private Boolean finish;
+    private Long userId;
+    private Long quantity;
+    private String company;
+    private Long groupId;
+    private String groupName;
+    private Long finishCount;
+    private Long unFinishCount;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/TodayOrderSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/TodayOrderSummary.java
new file mode 100644
index 0000000..d7a75fd
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/TodayOrderSummary.java
@@ -0,0 +1,17 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class TodayOrderSummary {
+    private Integer total;
+    private Integer completed;
+    private Integer cancelled;
+    private Integer waiting;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/UserSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/UserSummary.java
new file mode 100644
index 0000000..70cc0a3
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/UserSummary.java
@@ -0,0 +1,20 @@
+package com.njzscloud.supervisory.statistics.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class UserSummary {
+    private Integer sanHu;
+    private Integer qingYun;
+    private Integer wuYe;
+
+    public Integer getDaKeHu() {
+        return qingYun + wuYe;
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/StatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/StatisticsService.java
new file mode 100644
index 0000000..2c5c511
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/StatisticsService.java
@@ -0,0 +1,301 @@
+package com.njzscloud.supervisory.statistics.service;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.Week;
+import cn.hutool.core.map.MapUtil;
+import com.njzscloud.common.core.tuple.Tuple2;
+import com.njzscloud.common.core.tuple.Tuple3;
+import com.njzscloud.common.core.utils.GroupUtil;
+import com.njzscloud.supervisory.statistics.mapper.StatisticsMapper;
+import com.njzscloud.supervisory.statistics.pojo.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class StatisticsService {
+    private final StatisticsMapper statisticsMapper;
+
+    private final String[] weeks = {"周日", "周一", "周二", "周三", "周四", "周五", "周六"};
+    private final String[] months = {"1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"};
+
+    public Map obtainData() throws Exception {
+        CompletableFuture> carTrends = CompletableFuture.supplyAsync(statisticsMapper::getCarTrends)
+                .exceptionally(ex -> {
+                    log.error("车辆动态数据获取失败", ex);
+                    return Collections.emptyList();
+                });
+        CompletableFuture userSummary = CompletableFuture.supplyAsync(statisticsMapper::getUserSummary)
+                .exceptionally(ex -> {
+                    log.error("用户动态数据获取失败", ex);
+                    return null;
+                });
+        CompletableFuture> garbageDisposeSummary = CompletableFuture.supplyAsync(statisticsMapper::getGarbageDisposeSummary)
+                .thenApply(list -> {
+                    Double garbageDisposeSummary_totalWeight = list.stream()
+                            .filter(it -> it.getDepotType() == 1)
+                            .map(GarbageDisposeSummary::getWeight)
+                            .reduce(Double::sum).orElse(0D);
+
+                    for (GarbageDisposeSummary disposeSummary : list) {
+                        disposeSummary.setPercentage(garbageDisposeSummary_totalWeight == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight * 100);
+                    }
+                    return list;
+                })
+                .exceptionally(ex -> {
+                    log.error("垃圾处置动态数据获取失败", ex);
+                    return Collections.emptyList();
+                });
+
+        CompletableFuture> currentMonthGarbageDisposeSummary = CompletableFuture.supplyAsync(statisticsMapper::getCurrentMonthGarbageDisposeSummary)
+                .thenApply(list -> {
+                    Double currentMonthGarbageDisposeSummary_totalWeight = list.stream()
+                            .map(GarbageDisposeSummary::getWeight)
+                            .reduce(Double::sum).orElse(0D);
+
+                    for (GarbageDisposeSummary disposeSummary : list) {
+                        disposeSummary.setPercentage(disposeSummary.getWeight() / currentMonthGarbageDisposeSummary_totalWeight * 100);
+                    }
+                    return list;
+                })
+                .exceptionally(ex -> {
+                    log.error("当前月垃圾处置动态数据获取失败", ex);
+                    return Collections.emptyList();
+                });
+
+        CompletableFuture> summaries = CompletableFuture.supplyAsync(statisticsMapper::getOrderSummary)
+                .thenApply(orderSummary -> {
+                    List userIds = orderSummary.stream().map(OrderSummary::getUserId).distinct().collect(Collectors.toList());
+                    Map> map = GroupUtil.k_a(orderSummary, OrderSummary::getUserId);
+                    Map> map_ = new HashMap<>();
+                    map.forEach((s, orderSummaries) -> map_.put(s, GroupUtil.k_o(orderSummaries, OrderSummary::getFinish)));
+                    return userIds.stream()
+                            .map(it -> {
+                                Map map1 = map_.get(it);
+                                OrderSummary finish = map1.get(Boolean.TRUE);
+                                OrderSummary unFinish = map1.get(Boolean.FALSE);
+                                if (finish == null && unFinish == null) return null;
+
+                                Long finishCount = 0L;
+                                Long unFinishCount = 0L;
+                                String company = null;
+                                String groupName = null;
+
+                                if (finish != null) {
+                                    company = finish.getCompany();
+                                    groupName = finish.getGroupName();
+                                    finishCount = finish.getQuantity();
+                                }
+
+                                if (unFinish != null) {
+                                    company = unFinish.getCompany();
+                                    groupName = unFinish.getGroupName();
+                                    unFinishCount = unFinish.getQuantity();
+                                }
+
+                                return new OrderSummary()
+                                        .setUserId(it)
+                                        .setFinishCount(finishCount)
+                                        .setUnFinishCount(unFinishCount)
+                                        .setCompany(company)
+                                        .setGroupName(groupName);
+
+                            })
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                })
+                .exceptionally(ex -> {
+                    log.error("订单动态数据获取失败", ex);
+                    return Collections.emptyList();
+                });
+
+        DateTime date = DateUtil.date();
+
+        CompletableFuture today_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            long today_start = DateUtil.beginOfDay(date).getTime() / 1000;
+            long today_end = DateUtil.endOfDay(date).getTime() / 1000;
+            return statisticsMapper.disposeWeight(today_start, today_end);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
+        CompletableFuture yesterday_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            DateTime yesterday = DateUtil.offsetDay(date, -1);
+            long yesterday_start = DateUtil.beginOfDay(yesterday).getTime() / 1000;
+            long yesterday_end = DateUtil.endOfDay(yesterday).getTime() / 1000;
+            return statisticsMapper.disposeWeight(yesterday_start, yesterday_end);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
+        CompletableFuture week_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            long week_start = DateUtil.beginOfWeek(date).getTime() / 1000;
+            long week_end = DateUtil.endOfWeek(date).getTime() / 1000;
+            return statisticsMapper.disposeWeight(week_start, week_end);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
+        CompletableFuture month_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            long month_start = DateUtil.beginOfMonth(date).getTime() / 1000;
+            long month_end = DateUtil.endOfMonth(date).getTime() / 1000;
+            return statisticsMapper.disposeWeight(month_start, month_end);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
+        CompletableFuture year_disposeWeight = CompletableFuture.supplyAsync(() -> {
+            long year_start = DateUtil.beginOfYear(date).getTime() / 1000;
+            long year_end = DateUtil.endOfYear(date).getTime() / 1000;
+            return statisticsMapper.disposeWeight(year_start, year_end);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return 0D;
+        });
+
+        CompletableFuture, List>> weekAmount = CompletableFuture.supplyAsync(() -> {
+            long week_start = DateUtil.beginOfWeek(date).getTime() / 1000;
+            long week_end = DateUtil.endOfWeek(date).getTime() / 1000;
+            List week_orderAmountSummary = statisticsMapper.getOrderAmountSummary(week_start, week_end);
+            Map> week_temp_1 = GroupUtil.k_a(week_orderAmountSummary.stream().filter(it -> it.getCd() == 1), it -> {
+                Date outTime = it.getOutTime();
+                Week week = DateUtil.dayOfWeekEnum(outTime);
+                return weeks[week.getValue() - 1];
+            });
+            Map> week_temp_2 = GroupUtil.k_a(week_orderAmountSummary.stream().filter(it -> it.getCd() == 2), it -> {
+                Date outTime = it.getOutTime();
+                Week week = DateUtil.dayOfWeekEnum(outTime);
+                return weeks[week.getValue() - 1];
+            });
+            List weekAmountIn = new ArrayList<>(weeks.length);
+            for (String week : weeks) {
+                List orderAmountSummary = week_temp_1.getOrDefault(week, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                weekAmountIn.add(amount);
+            }
+            List weekAmountOut = new ArrayList<>(weeks.length);
+            for (String week : weeks) {
+                List orderAmountSummary = week_temp_2.getOrDefault(week, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                weekAmountOut.add(amount);
+            }
+            return Tuple2.create(weekAmountIn, weekAmountOut);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return Tuple2.create(Collections.emptyList(), Collections.emptyList());
+        });
+        CompletableFuture, List,List>> monthAmount = CompletableFuture.supplyAsync(() -> {
+            long month_start = DateUtil.beginOfMonth(date).getTime() / 1000;
+            long month_end = DateUtil.endOfMonth(date).getTime() / 1000;
+            List month_orderAmountSummary = statisticsMapper.getOrderAmountSummary(month_start, month_end);
+
+            int dayOfMonth = DateUtil.endOfMonth(date).dayOfMonth();
+            List days = new ArrayList<>(dayOfMonth);
+
+            for (int i = 0; i < dayOfMonth; i++) {
+                days.add(i + 1 + "号");
+            }
+            Map> month_temp_1 = GroupUtil.k_a(month_orderAmountSummary.stream().filter(it -> it.getCd() == 1), it -> {
+                Date outTime = it.getOutTime();
+                int day = DateUtil.dayOfMonth(outTime);
+                return days.get(day - 1);
+            });
+
+            Map> month_temp_2 = GroupUtil.k_a(month_orderAmountSummary.stream().filter(it -> it.getCd() == 2), it -> {
+                Date outTime = it.getOutTime();
+                int day = DateUtil.dayOfMonth(outTime);
+                return days.get(day - 1);
+            });
+            List monthAmountIn = new ArrayList<>(dayOfMonth);
+            List monthAmountOut = new ArrayList<>(dayOfMonth);
+            for (String day : days) {
+                List orderAmountSummary = month_temp_1.getOrDefault(day, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                monthAmountIn.add(amount);
+            }
+            for (String day : days) {
+                List orderAmountSummary = month_temp_2.getOrDefault(day, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                monthAmountOut.add(amount);
+            }
+            return Tuple3.create(monthAmountIn, monthAmountOut,days);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return Tuple3.create(Collections.emptyList(), Collections.emptyList(),Collections.emptyList());
+        });
+        CompletableFuture, List>> yearAmount = CompletableFuture.supplyAsync(() ->{
+            long year_start = DateUtil.beginOfYear(date).getTime() / 1000;
+            long year_end = DateUtil.endOfYear(date).getTime() / 1000;
+            List year_orderAmountSummary = statisticsMapper.getOrderAmountSummary(year_start, year_end);
+
+            Map> year_temp_1 = GroupUtil.k_a(year_orderAmountSummary.stream().filter(it -> it.getCd() == 1), it -> {
+                Date outTime = it.getOutTime();
+                int month = DateUtil.month(outTime);
+                return months[month];
+            });
+
+            Map> year_temp_2 = GroupUtil.k_a(year_orderAmountSummary.stream().filter(it -> it.getCd() == 2), it -> {
+                Date outTime = it.getOutTime();
+                int month = DateUtil.month(outTime);
+                return months[month];
+            });
+            List yearAmountIn = new ArrayList<>(months.length);
+            List yearAmountOut = new ArrayList<>(months.length);
+            for (String month : months) {
+                List orderAmountSummary = year_temp_1.getOrDefault(month, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                yearAmountIn.add(amount);
+            }
+            for (String month : months) {
+                List orderAmountSummary = year_temp_2.getOrDefault(month, Collections.emptyList());
+                Double amount = orderAmountSummary.stream().map(OrderAmountSummary::getAmount).reduce(Integer::sum).orElse(0) / 100.0;
+                yearAmountOut.add(amount);
+            }
+            return Tuple2.create(yearAmountIn, yearAmountOut);
+        }).exceptionally(ex -> {
+            log.error("订单动态数据获取失败", ex);
+            return Tuple2.create(Collections.emptyList(), Collections.emptyList());
+        });
+
+        CompletableFuture todayOrderSummary = CompletableFuture.supplyAsync(statisticsMapper::getTodayOrderSummary)
+                .exceptionally(ex -> {
+                    log.error("订单动态数据获取失败", ex);
+                    return new TodayOrderSummary();
+                });
+
+        Tuple2, List> weekAmount_ = weekAmount.get();
+        Tuple3, List,List> monthAmount_ = monthAmount.get();
+        Tuple2, List> yearAmount_ = yearAmount.get();
+        return MapUtil.builder()
+                .put("carTrends", carTrends.get())
+                .put("userSummary", userSummary.get())
+                .put("garbageDisposeSummary", garbageDisposeSummary.get())
+                .put("currentMonthGarbageDisposeSummary", currentMonthGarbageDisposeSummary.get())
+                .put("orderSummary", summaries.get())
+                .put("todayDisposeWeight", today_disposeWeight.get())
+                .put("yesterdayDisposeWeight", yesterday_disposeWeight.get())
+                .put("weekDisposeWeight", week_disposeWeight.get())
+                .put("monthDisposeWeight", month_disposeWeight.get())
+                .put("yearDisposeWeight", year_disposeWeight.get())
+                .put("todayOrderSummary", todayOrderSummary.get())
+                .put("weekAmountIn", weekAmount_.get_0())
+                .put("weekAmountOut", weekAmount_.get_1())
+                .put("monthAmountIn", monthAmount_.get_0())
+                .put("monthAmountOut", monthAmount_.get_1())
+                .put("days", monthAmount_.get_2())
+                .put("yearAmountIn", yearAmount_.get_0())
+                .put("yearAmountOut", yearAmount_.get_1())
+                .build();
+    }
+
+    public List obtainOrder(Long userId) {
+        return statisticsMapper.obtainOrder(userId);
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/contant/TenantStatus.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/contant/TenantStatus.java
new file mode 100644
index 0000000..a071202
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/contant/TenantStatus.java
@@ -0,0 +1,19 @@
+package com.njzscloud.supervisory.tenant.contant;
+
+import com.njzscloud.common.core.ienum.DictStr;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 字典代码：tenant_status
+ * 字典名称：状态
+ */
+@Getter
+@RequiredArgsConstructor
+public enum TenantStatus implements DictStr {
+    QiYong("QiYong", "启用"),
+    ;
+    private final String val;
+
+    private final String txt;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/controller/SysTenantController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/controller/SysTenantController.java
new file mode 100644
index 0000000..6e407e2
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/controller/SysTenantController.java
@@ -0,0 +1,86 @@
+package com.njzscloud.supervisory.tenant.controller;
+
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.tenant.pojo.SysTenantEntity;
+import com.njzscloud.supervisory.tenant.service.SysTenantService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 租户表
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_tenant")
+@RequiredArgsConstructor
+public class SysTenantController {
+
+    private final SysTenantService sysTenantService;
+
+    /**
+     * 新增
+     *
+     * @param sysTenantEntity 数据
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody SysTenantEntity sysTenantEntity) {
+        sysTenantService.add(sysTenantEntity);
+        return R.success();
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysTenantEntity 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody SysTenantEntity sysTenantEntity) {
+        sysTenantService.modify(sysTenantEntity);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        sysTenantService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysTenantEntity 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysTenantService.detail(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysTenantEntity 筛选条件
+     * @param pageParam       分页参数
+     * @return PageResult<SysTenantEntity> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam pageParam, SysTenantEntity sysTenantEntity) {
+        return R.success(sysTenantService.paging(pageParam, sysTenantEntity));
+    }
+
+    @GetMapping("/list")
+    public R> list() {
+        return R.success(sysTenantService.list());
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/mapper/SysTenantMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/mapper/SysTenantMapper.java
new file mode 100644
index 0000000..ebd43e1
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/mapper/SysTenantMapper.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.tenant.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.tenant.pojo.SysTenantEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 租户表
+ */
+@Mapper
+public interface SysTenantMapper extends BaseMapper {
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/pojo/SysTenantEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/pojo/SysTenantEntity.java
new file mode 100644
index 0000000..f5cb0e8
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/pojo/SysTenantEntity.java
@@ -0,0 +1,71 @@
+package com.njzscloud.supervisory.tenant.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.supervisory.tenant.contant.TenantStatus;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 租户表
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_tenant")
+public class SysTenantEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String sn;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 状态; 字典编码：tenant_status
+     */
+    private TenantStatus tenantStatus;
+
+    /**
+     * 创建人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/service/SysTenantService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/service/SysTenantService.java
new file mode 100644
index 0000000..ee028ec
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tenant/service/SysTenantService.java
@@ -0,0 +1,77 @@
+package com.njzscloud.supervisory.tenant.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.tenant.mapper.SysTenantMapper;
+import com.njzscloud.supervisory.tenant.pojo.SysTenantEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 租户表
+ */
+@Slf4j
+@Service
+public class SysTenantService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysTenantEntity 数据
+     */
+
+    public void add(SysTenantEntity sysTenantEntity) {
+        this.save(sysTenantEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysTenantEntity 数据
+     */
+
+    public void modify(SysTenantEntity sysTenantEntity) {
+        this.updateById(sysTenantEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysTenantEntity 结果
+     */
+
+    public SysTenantEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysTenantEntity 筛选条件
+     * @param pageParam       分页参数
+     * @return PageResult<SysTenantEntity> 分页结果
+     */
+
+    public PageResult paging(PageParam pageParam, SysTenantEntity sysTenantEntity) {
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(sysTenantEntity)));
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/contant/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/contant/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/controller/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/controller/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/mapper/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/mapper/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/pojo/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/pojo/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/service/.gitkeep b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/test/service/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/contant/Gender.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/contant/Gender.java
new file mode 100644
index 0000000..37587c2
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/contant/Gender.java
@@ -0,0 +1,21 @@
+package com.njzscloud.supervisory.user.contant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import com.njzscloud.common.core.ienum.DictStr;
+
+/**
+ * 字典代码：gender
+ * 字典名称：性别
+ */
+@Getter
+@RequiredArgsConstructor
+public enum Gender implements DictStr {
+    Unknown("Unknown", "未知"),
+    Man("Man", "男"),
+    Woman("Woman", "女");
+
+    private final String val;
+
+    private final String txt;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/controller/SysUserController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/controller/SysUserController.java
new file mode 100644
index 0000000..67d1201
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/controller/SysUserController.java
@@ -0,0 +1,106 @@
+package com.njzscloud.supervisory.user.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.njzscloud.common.core.utils.R;
+import com.njzscloud.common.mp.support.PageParam;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.supervisory.user.pojo.*;
+import com.njzscloud.supervisory.user.service.SysUserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 
sys_user

+ * 
用户信息表

+ */
+@Slf4j
+@RestController
+@RequestMapping("/sys_user")
+@RequiredArgsConstructor
+public class SysUserController {
+
+    private final SysUserService sysUserService;
+
+    /**
+     * 新增
+     *
+     * @param addUserParam 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody @Validated AddUserParam addUserParam) {
+        return R.success(sysUserService.add(addUserParam));
+    }
+
+    /**
+     * 修改
+     *
+     * @param userModifyParam 数据
+     */
+    @PostMapping("/modify")
+    public R modify(@RequestBody UserModifyParam userModifyParam) {
+        sysUserService.modify(userModifyParam);
+        return R.success();
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Ids
+     */
+    @PostMapping("/del")
+    public R del(@RequestBody List ids) {
+        Assert.notEmpty(ids, "未指定要删除的数据");
+        sysUserService.del(ids);
+        return R.success();
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return UserDetailResult 结果
+     */
+    @GetMapping("/detail")
+    public R detail(@RequestParam Long id) {
+        return R.success(sysUserService.detail(id));
+    }
+
+    @GetMapping("/my")
+    public R my() {
+        return R.success(sysUserService.my());
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param userQueryParam 筛选条件
+     * @param page           分页参数
+     * @return PageResult<UserDetailResult> 分页结果
+     */
+    @GetMapping("/paging")
+    public R> paging(PageParam page, UserQueryParam userQueryParam) {
+        return R.success(sysUserService.paging(page.toPage(), userQueryParam));
+    }
+
+    /**
+     * 用户注册
+     *
+     * @param userRegisterParam 参数
+     */
+    @PostMapping("/register")
+    public R register(@RequestBody @Validated UserRegisterParam userRegisterParam) {
+        sysUserService.register(userRegisterParam);
+        return R.success();
+    }
+
+    @PostMapping("/modify_passwd")
+    public R modifyPasswd(@RequestBody ModifyPasswdParam modifyPasswdParam) {
+        sysUserService.modifyPasswd(modifyPasswdParam);
+        return R.success();
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserAccountMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserAccountMapper.java
new file mode 100644
index 0000000..64d940a
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserAccountMapper.java
@@ -0,0 +1,29 @@
+package com.njzscloud.supervisory.user.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.njzscloud.supervisory.user.pojo.SysUserAccountEntity;
+import com.njzscloud.common.security.support.UserDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
sys_user_account

+ * 
用户账号信息表

+ */
+@Mapper
+public interface SysUserAccountMapper extends BaseMapper {
+
+    /**
+     * 分页查询
+     *
+     * @param page 分页参数
+     * @param ew   查询条件
+     * @return IPage<SysUserAccountEntity> 分页结果
+     */
+    IPage paging(IPage page, @Param(Constants.WRAPPER) Wrapper ew);
+
+    UserDetail selectUserByAccount(String account);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserMapper.java
new file mode 100644
index 0000000..68d1455
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserMapper.java
@@ -0,0 +1,26 @@
+package com.njzscloud.supervisory.user.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.njzscloud.supervisory.user.pojo.UserDetailResult;
+import com.njzscloud.supervisory.user.pojo.SysUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 用户信息表
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper {
+
+    /**
+     * 分页查询
+     *
+     * @param page 分页参数
+     * @param ew   查询条件
+     * @return IPage<UserDetailResult> 分页结果
+     */
+    IPage paging(IPage page, @Param(Constants.WRAPPER) Wrapper ew);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserRoleMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserRoleMapper.java
new file mode 100644
index 0000000..26bc2a8
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/mapper/SysUserRoleMapper.java
@@ -0,0 +1,18 @@
+package com.njzscloud.supervisory.user.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njzscloud.supervisory.user.pojo.SysUserRoleEntity;
+import com.njzscloud.supervisory.role.pojo.RoleDetailResult;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户-角色关系表
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper {
+    List listRole(@Param("ew") QueryWrapper ew);
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserAccountParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserAccountParam.java
new file mode 100644
index 0000000..c2cf5aa
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserAccountParam.java
@@ -0,0 +1,68 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Constraint
+@Accessors(chain = true)
+public class AddUserAccountParam implements Constrained {
+    /**
+     * 用户 Id; sys_user.id
+     */
+    private Long userId;
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "用户名不能为空")
+    private String username;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 密码
+     */
+    @NotBlank(message = "密码不能为空")
+    private String secret;
+    /**
+     * 微信 openid
+     */
+    private String wechatOpenid;
+    /**
+     * 微信 unionid
+     */
+    private String wechatUnionid;
+    /**
+     * 允许登录的客户端; 字典代码：client_code
+     */
+    private Integer clientCode;
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                // ValidRule.of(() -> StrUtil.isNotBlank(username), "用户名不能为空"),
+                // ValidRule.of(() -> StrUtil.isNotBlank(secret), "密码不能为空"),
+                ValidRule.of(() -> (StrUtil.isNotBlank(wechatOpenid) && StrUtil.isNotBlank(wechatUnionid)) ||
+                        (StrUtil.isBlank(wechatOpenid) && StrUtil.isBlank(wechatUnionid)), "微信账号不正确"),
+        };
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java
new file mode 100644
index 0000000..d0e24ee
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/AddUserParam.java
@@ -0,0 +1,51 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class AddUserParam implements Constrained {
+
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+    /**
+     * 账号信息
+     */
+    @Valid
+    private AddUserAccountParam account;
+    /**
+     * 角色 Id 列表
+     */
+    private List roleIds;
+
+    private List roles;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"),
+                ValidRule.of(() -> account != null, "账号信息不能为空"),
+        };
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyInfoParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyInfoParam.java
new file mode 100644
index 0000000..3d57f30
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyInfoParam.java
@@ -0,0 +1,23 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ModifyInfoParam {
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    private Gender gender;
+
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyPasswdParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyPasswdParam.java
new file mode 100644
index 0000000..41fc3b0
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ModifyPasswdParam.java
@@ -0,0 +1,13 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class ModifyPasswdParam {
+    private String oldPasswd;
+    private String newPasswd;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/MyResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/MyResult.java
new file mode 100644
index 0000000..277982c
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/MyResult.java
@@ -0,0 +1,51 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class MyResult {
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    List menus;
+
+    List> setting;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ObtainInfoResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ObtainInfoResult.java
new file mode 100644
index 0000000..09e602f
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/ObtainInfoResult.java
@@ -0,0 +1,94 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.setting.Setting;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class ObtainInfoResult {
+    /**
+     * 用户 Id
+     */
+    private Long id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 菜单
+     */
+    private List menus;
+
+    private Setting setting;
+
+    private Long tenantId;
+
+    private String tenantName;
+
+
+    @Getter
+    @Setter
+    @Accessors(chain = true)
+    public static class Menu {
+
+        private String sn;
+        /**
+         * Id
+         */
+        private Long id;
+
+        /**
+         * 上级 Id; 层级为 1 的节点值为 0
+         */
+        private Long pid;
+
+        /**
+         * 菜单名称
+         */
+        private String title;
+
+        /**
+         * 图标
+         */
+        private String icon;
+        private Integer tier;
+
+        /**
+         * 面包路径; 逗号分隔
+         */
+        private String[] breadcrumb;
+
+        /**
+         * 类型; 字典代码：menu_category
+         */
+        private String menuCategory;
+
+        /**
+         * 标签是否冻结; 0-->否、1-->是
+         */
+        private Boolean freeze;
+
+        /**
+         * 排序
+         */
+        private Integer sort;
+
+        /**
+         * 路由名称
+         */
+        private String routeName;
+
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserAccountEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserAccountEntity.java
new file mode 100644
index 0000000..d2adc2f
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserAccountEntity.java
@@ -0,0 +1,108 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
sys_user_account

+ * 
用户账号信息表

+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_user_account")
+public class SysUserAccountEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户 Id; sys_user.id
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 密码
+     */
+    private String secret;
+
+    /**
+     * 微信 openid
+     */
+    private String wechatOpenid;
+
+    /**
+     * 微信 unionid
+     */
+    private String wechatUnionid;
+
+    /**
+     * 注册时间
+     */
+    private LocalDateTime regdate;
+
+    /**
+     * 允许登录的客户端; 字典代码：client_code
+     */
+    private Integer clientCode;
+
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+
+    /**
+     * 创建人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserEntity.java
new file mode 100644
index 0000000..f18ac88
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserEntity.java
@@ -0,0 +1,85 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 用户信息表
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sys_user")
+public class SysUserEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    private Long tenantId;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 创建人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 修改人 Id; sys_user.id
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long modifierId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime modifyTime;
+
+    /**
+     * 是否删除; 0-->未删除、1-->已删除
+     */
+    @TableLogic
+    private Boolean deleted;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserRoleEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserRoleEntity.java
new file mode 100644
index 0000000..89287d0
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/SysUserRoleEntity.java
@@ -0,0 +1,35 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * 
用户-角色关系表

+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@TableName("sys_user_role")
+public class SysUserRoleEntity {
+
+    /**
+     * Id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户 Id; sys_user.id
+     */
+    private Long userId;
+
+    /**
+     * 角色 Id; sys_role.id
+     */
+    private Long roleId;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountDetailResult.java
new file mode 100644
index 0000000..a43f045
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountDetailResult.java
@@ -0,0 +1,43 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UserAccountDetailResult {
+    private Long id;
+
+    /**
+     * 用户 Id; sys_user.id
+     */
+    private Long userId;
+    /**
+     * 用户名
+     */
+    private String username;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 微信 openid
+     */
+    private String wechatOpenid;
+    /**
+     * 微信 unionid
+     */
+    private String wechatUnionid;
+    /**
+     * 允许登录的客户端; 字典代码：client_code
+     */
+    private Integer clientCode;
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountModifyParam.java
new file mode 100644
index 0000000..86268da
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserAccountModifyParam.java
@@ -0,0 +1,68 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Constraint
+@Accessors(chain = true)
+public class UserAccountModifyParam implements Constrained {
+    /**
+     * 用户 Id; sys_user.id
+     */
+    private Long userId;
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "用户名不能为空")
+    private String username;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 密码
+     */
+    @NotBlank(message = "密码不能为空")
+    private String secret;
+    /**
+     * 微信 openid
+     */
+    private String wechatOpenid;
+    /**
+     * 微信 unionid
+     */
+    private String wechatUnionid;
+    /**
+     * 允许登录的客户端; 字典代码：client_code
+     */
+    private Integer clientCode;
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                // ValidRule.of(() -> StrUtil.isNotBlank(username), "用户名不能为空"),
+                // ValidRule.of(() -> StrUtil.isNotBlank(secret), "密码不能为空"),
+                ValidRule.of(() -> (StrUtil.isNotBlank(wechatOpenid) && StrUtil.isNotBlank(wechatUnionid)) ||
+                        (StrUtil.isBlank(wechatOpenid) && StrUtil.isBlank(wechatUnionid)), "微信账号不正确"),
+        };
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserDetailResult.java
new file mode 100644
index 0000000..ee4cf7b
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserDetailResult.java
@@ -0,0 +1,47 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import com.njzscloud.supervisory.role.pojo.RoleDetailResult;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+public class UserDetailResult {
+    private Long id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    private String avatar;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 手机号
+     */
+    private String phone;
+    private Long tenantId;
+    /**
+     * 账号信息
+     */
+    private UserAccountDetailResult account;
+    /**
+     * 角色列表
+     */
+    private List roles;
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java
new file mode 100644
index 0000000..2f5fee8
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserModifyParam.java
@@ -0,0 +1,49 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.Constraint;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+@Getter
+@Setter
+@Constraint
+public class UserModifyParam implements Constrained {
+    @NotNull
+    private Long id;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    private String avatar;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    private UserAccountModifyParam account;
+
+    /**
+     * 角色 Id 列表
+     */
+    private List roleIds;
+    private List roles;
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> !(StrUtil.isBlank(nickname) && gender != null), "昵称和性别至少一个有值"),
+        };
+    }
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserQueryParam.java
new file mode 100644
index 0000000..0a7e05b
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserQueryParam.java
@@ -0,0 +1,37 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import lombok.Getter;
+import lombok.Setter;
+import com.njzscloud.supervisory.user.contant.Gender;
+
+@Getter
+@Setter
+public class UserQueryParam {
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 用户名
+     */
+    private String username;
+    /**
+     * 是否禁用; 0-->启用、1-->禁用
+     */
+    private Boolean disabled;
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserRegisterParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserRegisterParam.java
new file mode 100644
index 0000000..c8a52fa
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/pojo/UserRegisterParam.java
@@ -0,0 +1,201 @@
+package com.njzscloud.supervisory.user.pojo;
+
+import cn.hutool.core.util.StrUtil;
+import com.njzscloud.common.mvc.validator.Constrained;
+import com.njzscloud.common.mvc.validator.ValidRule;
+import com.njzscloud.supervisory.user.contant.Gender;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class UserRegisterParam implements Constrained {
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 性别; 字典代码：gender
+     */
+    private Gender gender;
+
+    /**
+     * 账号信息
+     */
+    private Account account;
+    /**
+     * 公司信息
+     */
+    private Company company;
+
+
+    @Override
+    public ValidRule[] rules() {
+        return new ValidRule[]{
+                ValidRule.of(() -> StrUtil.isNotBlank(nickname), "用户昵称不能为空"),
+                ValidRule.of(() -> account != null, "账号信息不能为空"),
+        };
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @Accessors(chain = true)
+    public static class Account implements Constrained {
+        /**
+         * 邮箱
+         */
+        private String email;
+
+        /**
+         * 手机号
+         */
+        private String phone;
+
+        /**
+         * 用户名
+         */
+        private String username;
+
+        /**
+         * 密码
+         */
+        private String secret;
+
+        @Override
+        public ValidRule[] rules() {
+            return new ValidRule[]{
+                    ValidRule.of(() -> StrUtil.isNotBlank(username), "用户名不能为空"),
+                    ValidRule.of(() -> StrUtil.isNotBlank(secret), "密码不能为空"),
+            };
+        }
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @Accessors(chain = true)
+    public static class Company implements Constrained {
+        /**
+         * 企业名称
+         */
+        private String companyName;
+
+        /**
+         * 统一社会信用代码; biz_company.uscc
+         */
+        private String uscc;
+
+        /**
+         * 营业执照; 图片
+         */
+        private String businessLicense;
+
+        /**
+         * 资质证明; 图片
+         */
+        private String certification;
+
+        /**
+         * 营业执照有效期; [开始日期，结束日期]
+         */
+        private List businessLicenseDate;
+
+        /**
+         * 资质证明有效期; [开始日期，结束日期]
+         */
+        private List certificationDate;
+
+        /**
+         * 法人名称
+         */
+        private String legalRepresentative;
+
+        /**
+         * 省; 名称
+         */
+        private String province;
+
+        /**
+         * 市; 名称
+         */
+        private String city;
+
+        /**
+         * 区; 名称
+         */
+        private String county;
+
+        /**
+         * 详细地址
+         */
+        private String address;
+
+        /**
+         * 联系人
+         */
+        private String contacts;
+
+        /**
+         * 联系电话
+         */
+        private String phoneNum;
+
+        /**
+         * 服务范围
+         */
+        private List scopeList;
+
+        @Override
+        public ValidRule[] rules() {
+            return new ValidRule[]{};
+        }
+    }
+
+
+    @Getter
+    @Setter
+    @ToString
+    @Accessors(chain = true)
+    public static class Scope implements Constrained {
+        /**
+         * 省; 名称
+         */
+        private String province;
+
+        /**
+         * 市; 名称
+         */
+        private String city;
+
+        /**
+         * 区; 名称
+         */
+        private String county;
+
+        /**
+         * 街道; 名称
+         */
+        private String street;
+
+        @Override
+        public ValidRule[] rules() {
+            return new ValidRule[]{};
+        }
+    }
+
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserAccountService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserAccountService.java
new file mode 100644
index 0000000..a373ecc
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserAccountService.java
@@ -0,0 +1,101 @@
+package com.njzscloud.supervisory.user.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.security.support.UserDetail;
+import com.njzscloud.common.security.util.EncryptUtil;
+import com.njzscloud.common.security.util.SecurityUtil;
+import com.njzscloud.supervisory.user.mapper.SysUserAccountMapper;
+import com.njzscloud.supervisory.user.pojo.AddUserAccountParam;
+import com.njzscloud.supervisory.user.pojo.SysUserAccountEntity;
+import com.njzscloud.supervisory.user.pojo.UserAccountModifyParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
sys_user_account

+ * 
用户账号信息表

+ */
+@Slf4j
+@Service
+public class SysUserAccountService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param addUserAccountParam 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+    public void add(AddUserAccountParam addUserAccountParam) {
+        SysUserAccountEntity userAccountEntity = BeanUtil.copyProperties(addUserAccountParam, SysUserAccountEntity.class)
+                .setSecret(EncryptUtil.encrypt(addUserAccountParam.getSecret()))
+                .setRegdate(LocalDateTime.now());
+        this.save(userAccountEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param userAccountModifyParam 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean modify(UserAccountModifyParam userAccountModifyParam) {
+        SysUserAccountEntity oldData = this.getOne(Wrappers.lambdaQuery().eq(SysUserAccountEntity::getUserId, userAccountModifyParam.getUserId()));
+        SysUserAccountEntity entity = BeanUtil.copyProperties(userAccountModifyParam, SysUserAccountEntity.class)
+                .setId(oldData.getId())
+                .setSecret(EncryptUtil.encrypt(userAccountModifyParam.getSecret()));
+        if (userAccountModifyParam.getDisabled() == Boolean.TRUE) {
+            Long userId = oldData.getUserId();
+            SecurityUtil.removeToken(userId);
+        }
+        return this.updateById(entity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param id Id
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+
+    public boolean del(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysUserAccountEntity 结果
+     */
+
+    public SysUserAccountEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param sysUserAccountEntity 筛选条件
+     * @param page                 分页参数
+     * @return IPage<SysUserAccountEntity> 分页结果
+     */
+
+    public IPage paging(IPage page, SysUserAccountEntity sysUserAccountEntity) {
+        Wrapper ew = Wrappers.query(sysUserAccountEntity);
+        return baseMapper.paging(page, ew);
+    }
+
+    public UserDetail getUserInfo(String account) {
+        return baseMapper.selectUserByAccount(account);
+    }
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserRoleService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserRoleService.java
new file mode 100644
index 0000000..841a2b6
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserRoleService.java
@@ -0,0 +1,76 @@
+package com.njzscloud.supervisory.user.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.supervisory.role.pojo.RoleDetailResult;
+import com.njzscloud.supervisory.user.pojo.SysUserRoleEntity;
+import com.njzscloud.supervisory.user.mapper.SysUserRoleMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 
用户-角色关系表

+ */
+@Slf4j
+@Service
+public class SysUserRoleService extends ServiceImpl implements IService {
+
+    /**
+     * 新增
+     *
+     * @param sysUserRoleEntity 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+
+    public boolean add(SysUserRoleEntity sysUserRoleEntity) {
+        return this.save(sysUserRoleEntity);
+    }
+
+    /**
+     * 修改
+     *
+     * @param sysUserRoleEntity 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+
+    public boolean modify(SysUserRoleEntity sysUserRoleEntity) {
+        return this.updateById(sysUserRoleEntity);
+    }
+
+    /**
+     * 删除
+     *
+     * @param id Id
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+
+    public boolean del(Long id) {
+        return this.removeById(id);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return SysUserRoleEntity 结果
+     */
+
+    public SysUserRoleEntity detail(Long id) {
+        return this.getById(id);
+    }
+
+
+    public void delByUserIds(List userIdList) {
+        this.remove(Wrappers.lambdaQuery().in(SysUserRoleEntity::getUserId, userIdList));
+    }
+
+
+    public List listRole(Long userId) {
+        return baseMapper.listRole(Wrappers.query().eq("a.user_id", userId));
+    }
+
+
+}
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java
new file mode 100644
index 0000000..5175dce
--- /dev/null
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/user/service/SysUserService.java
@@ -0,0 +1,248 @@
+package com.njzscloud.supervisory.user.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.ex.Exceptions;
+import com.njzscloud.common.mp.support.PageResult;
+import com.njzscloud.common.security.support.MenuResource;
+import com.njzscloud.common.security.support.UserDetail;
+import com.njzscloud.common.security.util.EncryptUtil;
+import com.njzscloud.common.security.util.SecurityUtil;
+import com.njzscloud.supervisory.menu.service.SysMenuService;
+import com.njzscloud.supervisory.role.pojo.RoleDetailResult;
+import com.njzscloud.supervisory.role.pojo.SysRoleEntity;
+import com.njzscloud.supervisory.role.service.SysRoleService;
+import com.njzscloud.supervisory.user.contant.Gender;
+import com.njzscloud.supervisory.user.mapper.SysUserMapper;
+import com.njzscloud.supervisory.user.pojo.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息表
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SysUserService extends ServiceImpl implements IService {
+    private final SysUserAccountService sysUserAccountService;
+    private final SysRoleService sysRoleService;
+    private final SysUserRoleService sysUserRoleService;
+    private final SysMenuService sysMenuService;
+
+    /**
+     * 新增
+     *
+     * @param addUserParam 数据
+     * @return boolean 结果; true-->成功、false-->失败
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Long add(AddUserParam addUserParam) {
+        AddUserAccountParam addUserAccountParam = addUserParam.getAccount();
+        String username = addUserAccountParam.getUsername();
+        String email = addUserAccountParam.getEmail();
+        String phone = addUserAccountParam.getPhone();
+        String wechatOpenid = addUserAccountParam.getWechatOpenid();
+        String wechatUnionid = addUserAccountParam.getWechatUnionid();
+        List oldSysUserList = sysUserAccountService.list(Wrappers.lambdaQuery()
+                .eq(SysUserAccountEntity::getUsername, username)
+                .or().eq(StrUtil.isNotBlank(email), SysUserAccountEntity::getEmail, email)
+                .or().eq(StrUtil.isNotBlank(phone), SysUserAccountEntity::getPhone, phone)
+                .or(StrUtil.isNotBlank(wechatOpenid) && StrUtil.isNotBlank(wechatUnionid), it -> it.eq(SysUserAccountEntity::getWechatOpenid, wechatOpenid).eq(SysUserAccountEntity::getWechatUnionid, wechatUnionid))
+        );
+        Assert.isTrue(oldSysUserList.stream().noneMatch(it -> username.equals(it.getUsername())), () -> Exceptions.exception("用户名【{}】已被使用", username));
+        Assert.isTrue(StrUtil.isBlank(email) || oldSysUserList.stream().noneMatch(it -> email.equals(it.getEmail())), () -> Exceptions.exception("邮箱【{}】已被使用", email));
+        Assert.isTrue(StrUtil.isBlank(phone) || oldSysUserList.stream().noneMatch(it -> phone.equals(it.getPhone())), () -> Exceptions.exception("手机号【{}】已被使用", phone));
+        Assert.isTrue(StrUtil.isBlank(wechatOpenid) || StrUtil.isBlank(wechatUnionid) || oldSysUserList.stream().noneMatch(it -> wechatOpenid.equals(it.getWechatOpenid()) && wechatUnionid.equals(it.getWechatUnionid())), () -> Exceptions.exception("该微信账号已被使用"));
+
+        SysUserEntity sysUserEntity = BeanUtil.copyProperties(addUserParam, SysUserEntity.class);
+        if (StrUtil.isNotBlank(email)) sysUserEntity.setEmail(email);
+        if (StrUtil.isNotBlank(phone)) sysUserEntity.setPhone(phone);
+        this.save(sysUserEntity);
+
+        Long userEntityId = sysUserEntity.getId();
+
+        sysUserAccountService.add(addUserAccountParam.setUserId(userEntityId));
+
+        // List roleIds = addUserParam.getRoleIds();
+        List roles = addUserParam.getRoles();
+        if (CollUtil.isEmpty(roles)) return userEntityId;
+
+        List roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList());
+
+        List sysRoleEntities = sysRoleService.listByIds(roleIds);
+        Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));
+
+        sysUserRoleService.saveBatch(roleIds.stream().map(roleId -> new SysUserRoleEntity().setRoleId(roleId).setUserId(userEntityId)).collect(Collectors.toList()));
+
+        return userEntityId;
+    }
+
+    /**
+     * 修改
+     *
+     * @param userModifyParam 数据
+     */
+    public void modify(UserModifyParam userModifyParam) {
+        Long id = userModifyParam.getId();
+        SysUserEntity sysUserEntity = this.getById(id);
+        Assert.notNull(sysUserEntity, "要修改的数据不存在");
+
+        UserAccountModifyParam account = userModifyParam.getAccount();
+        String username = account.getUsername();
+        String email = account.getEmail();
+        String phone = account.getPhone();
+        String wechatOpenid = account.getWechatOpenid();
+        String wechatUnionid = account.getWechatUnionid();
+
+        List oldSysUserList = sysUserAccountService.list(Wrappers.lambdaQuery()
+                .ne(SysUserAccountEntity::getUserId, id)
+                .and(it1 -> it1
+                        .eq(SysUserAccountEntity::getUsername, username)
+                        .or().eq(StrUtil.isNotBlank(email), SysUserAccountEntity::getEmail, email)
+                        .or().eq(StrUtil.isNotBlank(phone), SysUserAccountEntity::getPhone, phone)
+                        .or(StrUtil.isNotBlank(wechatOpenid) && StrUtil.isNotBlank(wechatUnionid),
+                                it -> it.eq(SysUserAccountEntity::getWechatOpenid, wechatOpenid)
+                                        .eq(SysUserAccountEntity::getWechatUnionid, wechatUnionid))
+                )
+        );
+        Assert.isTrue(oldSysUserList.stream().noneMatch(it -> username.equals(it.getUsername())), () -> Exceptions.exception("用户名【{}】已被使用", username));
+        Assert.isTrue(StrUtil.isBlank(email) || oldSysUserList.stream().noneMatch(it -> email.equals(it.getEmail())), () -> Exceptions.exception("邮箱【{}】已被使用", email));
+        Assert.isTrue(StrUtil.isBlank(phone) || oldSysUserList.stream().noneMatch(it -> phone.equals(it.getPhone())), () -> Exceptions.exception("手机号【{}】已被使用", phone));
+        Assert.isTrue(StrUtil.isBlank(wechatOpenid) || StrUtil.isBlank(wechatUnionid) || oldSysUserList.stream().noneMatch(it -> wechatOpenid.equals(it.getWechatOpenid()) && wechatUnionid.equals(it.getWechatUnionid())), () -> Exceptions.exception("该微信账号已被使用"));
+
+        sysUserEntity = BeanUtil.copyProperties(userModifyParam, SysUserEntity.class);
+        if (StrUtil.isNotBlank(email)) sysUserEntity.setEmail(email);
+        if (StrUtil.isNotBlank(phone)) sysUserEntity.setPhone(phone);
+        this.updateById(sysUserEntity);
+
+        sysUserAccountService.modify(account.setUserId(id));
+
+        // List roleIds = userModifyParam.getRoleIds();
+        List roles = userModifyParam.getRoles();
+
+        if (CollUtil.isEmpty(roles)) return;
+
+        List roleIds = roles.stream().map(SysRoleEntity::getId).collect(Collectors.toList());
+
+        List sysRoleEntities = sysRoleService.listByIds(roleIds);
+        Assert.isTrue(sysRoleEntities.size() == roleIds.size(), () -> Exceptions.exception("角色不存在"));
+
+        sysUserRoleService.remove(Wrappers.lambdaQuery().eq(SysUserRoleEntity::getUserId, id));
+
+        sysUserRoleService.saveBatch(roleIds.stream().map(roleId -> new SysUserRoleEntity().setRoleId(roleId).setUserId(id)).collect(Collectors.toList()));
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids Id
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void del(List ids) {
+        this.removeByIds(ids);
+        sysUserAccountService.remove(Wrappers.lambdaQuery().in(SysUserAccountEntity::getUserId, ids));
+        sysUserRoleService.delByUserIds(ids);
+    }
+
+    /**
+     * 详情
+     *
+     * @param id Id
+     * @return UserDetailResult 结果
+     */
+    public UserDetailResult detail(Long id) {
+        SysUserEntity sysUserEntity = this.getById(id);
+        Assert.notNull(sysUserEntity, "未查询到用户信息");
+        UserDetailResult userDetailResult = BeanUtil.copyProperties(sysUserEntity, UserDetailResult.class);
+        SysUserAccountEntity userAccountEntity = sysUserAccountService.getOne(Wrappers.lambdaQuery().eq(SysUserAccountEntity::getUserId, id));
+        Assert.notNull(userAccountEntity, "未查询到用户信息");
+        UserAccountDetailResult userAccountDetailResult = BeanUtil.copyProperties(userAccountEntity, UserAccountDetailResult.class);
+        List roleDetailResults = sysUserRoleService.listRole(id);
+        return userDetailResult
+                .setTenantId(sysUserEntity.getTenantId())
+                .setAccount(userAccountDetailResult)
+                .setRoles(roleDetailResults);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param page           分页参数
+     * @param userQueryParam 筛选条件
+     * @return PageResult<UserDetailResult> 分页结果
+     */
+    public PageResult paging(IPage page, UserQueryParam userQueryParam) {
+        String nickname = userQueryParam.getNickname();
+        Gender gender = userQueryParam.getGender();
+        String email = userQueryParam.getEmail();
+        String phone = userQueryParam.getPhone();
+        String username = userQueryParam.getUsername();
+        Boolean disabled = userQueryParam.getDisabled();
+        QueryWrapper ew = Wrappers.query()
+                .like(StrUtil.isNotBlank(nickname), "a.nickname", nickname)
+                .eq(gender != null, "a.gender", gender)
+                .like(StrUtil.isNotBlank(email), "a.email", email)
+                .like(StrUtil.isNotBlank(phone), "a.phone", phone)
+                .like(StrUtil.isNotBlank(username), "b.username", username)
+                .eq(disabled != null, "b.disabled", disabled);
+        return PageResult.of(baseMapper.paging(page, ew));
+    }
+
+    public UserDetail getUserInfo(String account) {
+        return sysUserAccountService.getUserInfo(account);
+    }
+
+    public void modifyPasswd(ModifyPasswdParam modifyPasswdParam) {
+        Long userId = SecurityUtil.loginUser().getUserId();
+        SysUserAccountEntity accountEntity = sysUserAccountService.getOne(Wrappers.lambdaQuery().eq(SysUserAccountEntity::getUserId, userId));
+        boolean matches = EncryptUtil.matches(modifyPasswdParam.getOldPasswd(), accountEntity.getSecret());
+        Assert.isTrue(matches, () -> Exceptions.exception("密码错误"));
+        String newPasswd = EncryptUtil.encrypt(modifyPasswdParam.getNewPasswd());
+
+        Long id = accountEntity.getId();
+
+        sysUserAccountService.updateById(new SysUserAccountEntity()
+                .setId(id)
+                .setSecret(newPasswd)
+        );
+    }
+
+    /**
+     * 用户注册
+     *
+     * @param userRegisterParam 参数
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void register(UserRegisterParam userRegisterParam) {
+        AddUserParam addUserParam = BeanUtil.copyProperties(userRegisterParam, AddUserParam.class);
+        addUserParam.setAccount(BeanUtil.copyProperties(userRegisterParam.getAccount(), AddUserAccountParam.class));
+        Long userId = this.add(addUserParam);
+
+        UserRegisterParam.Company company = userRegisterParam.getCompany();
+        Assert.notNull(company, "公司信息不能为空");
+
+        List scopeList = company.getScopeList();
+    }
+
+    public MyResult my() {
+        UserDetail userDetail = SecurityUtil.loginUser();
+        Long userId = userDetail.getUserId();
+        SysUserEntity sysUserEntity = this.getById(userId);
+        List menuResources = sysMenuService.listUserMenu(userId);
+        return BeanUtil.copyProperties(sysUserEntity, MyResult.class)
+                .setMenus(menuResources);
+    }
+}
diff --git a/njzscloud-svr/src/main/resources/application-dev.yml b/njzscloud-svr/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..0e2c745
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/application-dev.yml
@@ -0,0 +1,51 @@
+spring:
+  servlet:
+    multipart:
+      location: D:\ProJects\gov_manage\njzscloud-supervisory-svr\logs\temp
+  datasource:
+    url: jdbc:mysql://localhost:33061/green_frog?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    username: dbard01
+    password: mik9uvNZ
+  redis:
+    enable: false
+    pubsub: false
+    host: localhost
+    #password: redis
+    database: 0
+    port: 6379
+
+  mail:
+    # 邮件服务器
+    host: smtp.qq.com
+    # 发送邮件的账户
+    username: lzq@qq.com
+    # 授权码
+    password: lzq
+  security:
+    auth-ignores: /statistics/**
+oss:
+  path: D:/ProJects/gov_manage/njzscloud-supervisory-svr/logs
+  minio:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    access-key: LTAI5tJJu2WayYchExrT5W1E
+    secret-key: zllX0ZJ1EwsZXT6dE6swCLgTF4ImGg
+    region: cn-shanghai
+    bucket-name: cdn-zsy
+
+app:
+  district:
+    province: 320000
+    city: 320100
+
+mybatis-plus:
+  tunnel:
+    enable: true
+    ssh:
+      host: 121.43.155.83
+      port: 22
+      user: root
+      credentials: D:/我的/再昇云/客户信息归档/达州首炬/dzsj.pem
+      localPort: 33061
+    db:
+      host: rm-bp1w3397b718u1882.mysql.rds.aliyuncs.com
+      port: 3306
diff --git a/njzscloud-svr/src/main/resources/application-prod.yml b/njzscloud-svr/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..898003d
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/application-prod.yml
@@ -0,0 +1,53 @@
+spring:
+  servlet:
+    multipart:
+      location: /home/zsy/recycling_supervision/server/temp
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/zsy_recycling_supervision?characterEncoding=UTF-8&allowMultiQueries=true&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: Ch3nTx2BBJ28AiCZ
+  security:
+    auth-ignores:
+      - /dispose_record/report
+      - /project_clearance_detail/report
+  redis:
+    enable: false
+    pubsub: false
+    host: localhost
+    #password: redis
+    database: 0
+    port: 6379
+
+  mail:
+    # 邮件服务器
+    host: smtp.qq.com
+    # 发送邮件的账户
+    username: lzq@qq.com
+    # 授权码
+    password: lzq
+oss:
+  path: D:/ProJects/gov_manage/njzscloud-supervisory-svr/logs
+  minio:
+    endpoint: http://localhost:9090
+    access-key: minioadmin
+    secret-key: sdawi5nEH44wycoxOONSg
+    bucket-name: zsy
+
+
+app:
+  district:
+    province: 320000
+    city: 320100
+
+mybatis-plus:
+  tunnel:
+    enable: false
+    ssh:
+      host: 139.224.54.144
+      port: 22
+      user: root
+      credentials: D:/我的/再昇云/服务器秘钥/139.224.54.144_YZS_S1.pem
+      localPort: 33061
+    db:
+      host: localhost
+      port: 33061
diff --git a/njzscloud-svr/src/main/resources/application.yml b/njzscloud-svr/src/main/resources/application.yml
new file mode 100644
index 0000000..06c40c3
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/application.yml
@@ -0,0 +1,74 @@
+server:
+  tomcat:
+    max-http-form-post-size: 20MB
+  port: 10086
+spring:
+  servlet:
+    multipart:
+      max-file-size: 20MB
+      max-request-size: 20MB
+      file-size-threshold: 1MB
+      resolve-lazily: true
+  profiles:
+    active: ${APP_PROFILE:dev}
+  web:
+    resources:
+      add-mappings: false
+  mvc:
+    throw-exception-if-no-handler-found: true
+    format:
+      date: yyyy-MM-dd
+      time: HH:mm:ss
+      date-time: yyyy-MM-dd HH:mm:ss
+  jackson:
+    locale: zh_CN
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    default-property-inclusion: always
+    serialization:
+      # 对象不含任何字段时是否报错
+      fail-on-empty-beans: false
+      # 是否捕获并且包装异常信息
+      wrap-exceptions: true
+      # 是否将字符数组输出为数组
+      write-char-arrays-as-json-arrays: true
+      # 格式化输出（加入空格/回车）
+      indent-output: true
+      # 对 Map 类型按键排序
+      order-map-entries-by-keys: true
+      # 是否将日期/时间序列化为时间错
+      write-dates-as-timestamps: false
+      write-bigdecimal-as-plain: true
+    deserialization:
+      # 未知属性是否报错
+      fail-on-unknown-properties: false
+    generator:
+      # 是否忽略位置属性
+      ignore-unknown: true
+    visibility:
+      creator: public_only
+      field: any
+      getter: public_only
+      is-getter: public_only
+      setter: public_only
+
+  datasource:
+    hikari:
+      minimum-idle: 10
+      maximum-pool-size: 30
+      auto-commit: true
+      idle-timeout: 30000
+      pool-name: HikariCP
+      max-lifetime: 900000
+      connection-timeout: 10000
+      connection-test-query: SELECT 1
+      validation-timeout: 1000
+logging:
+  level:
+    com.njzscloud.common.sichen.SysTaskMapper: off
+    com.njzscloud: debug
+
+mybatis-plus:
+  type-handlers-package: com.njzscloud.common.mp.support.handler.j
+  configuration:
+    default-enum-type-handler: com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer
diff --git a/njzscloud-svr/src/main/resources/logback-spring.xml b/njzscloud-svr/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..00e2d7c
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/logback-spring.xml
@@ -0,0 +1,37 @@
+
+
+    
+
+    
+    
+
+    
+
+    
+
+    
+        false
+        
+            ${console_pattern}
+        
+    
+
+    
+        ${log_path}/${service_name}.log
+        
+            ${log_path}/${service_name}/%d{yyyy-MM, aux}/${service_name}.%d{yyyy-MM-dd}.%i.log.zip
+            50MB
+            30
+        
+        
+            ${file_pattern}
+        
+    
+
+
+    
+    
+        
+        
+    
+
diff --git a/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml
new file mode 100644
index 0000000..439f43f
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/StatisticsMapper.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysEndpointMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysEndpointMapper.xml
new file mode 100644
index 0000000..b9267e7
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysEndpointMapper.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+    
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysMenuMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysMenuMapper.xml
new file mode 100644
index 0000000..cb24fee
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysMenuMapper.xml
@@ -0,0 +1,26 @@
+
+
+
+    
+
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysResourceMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysResourceMapper.xml
new file mode 100644
index 0000000..0a26bfa
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysResourceMapper.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+    
+        
+    
+    
+
+    
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysRoleMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysRoleMapper.xml
new file mode 100644
index 0000000..359df60
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysRoleMapper.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+    
+
+    
+
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysUserAccountMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysUserAccountMapper.xml
new file mode 100644
index 0000000..2b43f9a
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysUserAccountMapper.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+    
+
+    
+
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysUserMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysUserMapper.xml
new file mode 100644
index 0000000..c6f7646
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysUserMapper.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+    
+        
+            
+        
+    
+
+    
+
diff --git a/njzscloud-svr/src/main/resources/mapper/SysUserRoleMapper.xml b/njzscloud-svr/src/main/resources/mapper/SysUserRoleMapper.xml
new file mode 100644
index 0000000..6cc5607
--- /dev/null
+++ b/njzscloud-svr/src/main/resources/mapper/SysUserRoleMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+    
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..9aea99f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,201 @@
+
+
+    4.0.0
+
+    com.njzscloud
+    big-screen
+    0.0.1
+    pom
+
+    
+        njzscloud-common
+        njzscloud-svr
+    
+
+    
+        8
+        8
+        UTF-8
+
+        2.6.13
+
+        3.5.12
+
+        1.6.2
+        2.0.51
+        4.0.3
+        5.8.28
+        3.3.0
+        4.12.0
+        2.4.1
+        8.5.17
+
+        3.3.1
+    
+
+    
+        
+            
+                com.xuxueli
+                xxl-job-core
+                ${xxl-job.version}
+            
+            
+                org.mapstruct
+                mapstruct
+                ${mapstruct.version}
+            
+            
+                com.njzscloud
+                njzscloud-common-core
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-sichen
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-sn
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-mp
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-mvc
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-redis
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-minio
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-security
+                0.0.1
+            
+            
+                com.njzscloud
+                njzscloud-common-gen
+                0.0.1
+            
+
+            
+                com.alibaba.fastjson2
+                fastjson2
+                ${fastjson2.version}
+            
+            
+                io.minio
+                minio
+                ${minio.version}
+            
+            
+                cglib
+                cglib
+                ${cglib.version}
+            
+
+            
+                com.squareup.okhttp3
+                okhttp
+                ${okhttp.version}
+            
+
+            
+                com.alibaba
+                easyexcel
+                ${easyexcel.version}
+            
+
+            
+                org.projectlombok
+                lombok
+                1.18.30
+            
+            
+                cn.hutool
+                hutool-bom
+                ${hutool.version}
+                pom
+                import
+            
+            
+                com.baomidou
+                mybatis-plus-bom
+                ${mybatis-plus.version}
+                pom
+                import
+            
+            
+                org.springframework.boot
+                spring-boot-dependencies
+                ${spring-boot.version}
+                pom
+                import
+            
+        
+    
+
+    
+        ${project.name}-${project.version}
+        
+            
+                src/main/resources
+                true
+            
+        
+        
+            
+                org.apache.maven.plugins
+                maven-resources-plugin
+                ${maven-resources-plugin.version}
+                
+                    UTF-8
+                    
+                        pdf
+                        ico
+                        eot
+                        ttf
+                        woff
+                        woff2
+                        ftl
+                        css
+                        svg
+                        js
+                        otf
+                    
+                
+            
+        
+        
+            
+                
+                    org.springframework.boot
+                    spring-boot-maven-plugin
+                    ${spring-boot.version}
+                    
+                        
+                            
+                                repackage
+                            
+                        
+                    
+                
+            
+        
+    
+