From b412695a2721515bea150f82b636416be992c1c4 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 16 Jun 2023 17:02:48 +0800 Subject: [PATCH 01/35] =?UTF-8?q?feat=20=E6=9F=A5=E8=AF=A2=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=94=AF=E6=8C=81=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/AnnotationQueryGenerator.java | 30 +++++++++++++++++-- .../query/generator/QueryGenerator.java | 5 ++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java index bfebee8e..800656e6 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java @@ -3,12 +3,15 @@ package cn.bootx.platform.common.query.generator; import cn.bootx.platform.common.core.annotation.QueryParam; import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.entity.QueryOrder; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.NamingCase; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.common.collect.Lists; import lombok.experimental.UtilityClass; import lombok.val; @@ -80,7 +83,7 @@ public class AnnotationQueryGenerator { * @param 泛型 * @return 查询器 */ - QueryWrapper generator(Object queryParams) { + QueryWrapper generator(Object queryParams, QueryOrder...queryOrder) { QueryWrapper wrapper = new QueryWrapper<>(); if (Objects.isNull(queryParams)) { @@ -111,6 +114,9 @@ public class AnnotationQueryGenerator { } } + // 处理排序条件 + initQueryOrder(wrapper,Objects.isNull(queryOrder)?null: Lists.newArrayList(queryOrder)); + return wrapper; } @@ -193,7 +199,7 @@ public class AnnotationQueryGenerator { /** * 获取字段对应的数据库字段名 */ - public String getDatabaseFieldName(PropertyDescriptor paramDescriptor, Class paramClass, + private String getDatabaseFieldName(PropertyDescriptor paramDescriptor, Class paramClass, PropertyDescriptor entityDescriptor, Class entityClass, QueryParam.NamingCaseEnum namingCase) { // 读取注解， 判断有没有自定义字段名, 有自定义字段名直接返回 val queryParam = getQueryParamAnnotation(paramDescriptor, paramClass, entityDescriptor, entityClass); @@ -217,4 +223,24 @@ public class AnnotationQueryGenerator { return ""; } + /** + * 组装排序条件 + * @param queryWrapper 查询器 + * @param queryOrders 排序条件 + * @param 泛型 + */ + private void initQueryOrder(QueryWrapper queryWrapper, List queryOrders) { + if (CollUtil.isEmpty(queryOrders)) { + return; + } + for (QueryOrder queryOrder : queryOrders) { + if (queryOrder.isUnderLine()) { + queryWrapper.orderBy(true, queryOrder.isAsc(), StrUtil.toUnderlineCase(queryOrder.getSortField())); + } + else { + queryWrapper.orderBy(true, queryOrder.isAsc(), queryOrder.getSortField()); + } + } + } + } diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java index dd09b6f0..6b2169e3 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java @@ -1,5 +1,6 @@ package cn.bootx.platform.common.query.generator; +import cn.bootx.platform.common.query.entity.QueryOrder; import cn.bootx.platform.common.query.entity.QueryParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -33,8 +34,8 @@ public class QueryGenerator { * @param 泛型 * @return 查询器 */ - public static QueryWrapper generator(Object queryParams) { - return AnnotationQueryGenerator.generator(queryParams); + public static QueryWrapper generator(Object queryParams, QueryOrder...queryOrder) { + return AnnotationQueryGenerator.generator(queryParams,queryOrder); } /** -- Gitee From c762c1b435cf38deb70e469fc9458086ca3dba6d Mon Sep 17 00:00:00 2001 From: xxm Date: Fri, 23 Jun 2023 14:52:53 +0800 Subject: [PATCH 02/35] =?UTF-8?q?build=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6801773..58d9dcbc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.11 + 2.7.13 -- Gitee From e3c14dcee451464d122eb3b23b20c32fa2b44a22 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Sun, 25 Jun 2023 16:53:31 +0800 Subject: [PATCH 03/35] =?UTF-8?q?doc=20=E6=9B=B4=E6=96=B0java=20doc?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bootx/platform/common/core/annotation/BigField.java | 2 +- .../cn/bootx/platform/common/core/annotation/CountTime.java | 2 +- .../bootx/platform/common/core/annotation/DataVersionLog.java | 2 +- .../platform/common/core/annotation/EncryptionField.java | 2 +- .../cn/bootx/platform/common/core/annotation/Idempotent.java | 2 +- .../java/cn/bootx/platform/common/core/annotation/JobLog.java | 2 +- .../platform/common/core/annotation/NestedPermission.java | 2 +- .../cn/bootx/platform/common/core/annotation/OperateLog.java | 2 +- .../cn/bootx/platform/common/core/annotation/OperateLogs.java | 2 +- .../cn/bootx/platform/common/core/annotation/PermCode.java | 2 +- .../cn/bootx/platform/common/core/annotation/Permission.java | 2 +- .../cn/bootx/platform/common/core/annotation/QueryParam.java | 2 +- .../platform/common/core/annotation/TableFieldConvert.java | 2 +- .../common/core/annotation/TableFieldConvertModel.java | 2 +- .../cn/bootx/platform/common/core/annotation/Translate.java | 2 +- .../platform/common/core/annotation/TranslationResult.java | 2 +- .../java/cn/bootx/platform/common/core/code/CommonCode.java | 2 +- .../java/cn/bootx/platform/common/core/code/ServletCode.java | 2 +- .../java/cn/bootx/platform/common/core/entity/UserDetail.java | 2 +- .../platform/common/core/exception/DangerSqlException.java | 2 +- .../platform/common/core/exception/DataNotExistException.java | 2 +- .../common/core/exception/OptimisticLockException.java | 2 +- .../common/core/exception/RepetitiveOperationException.java | 2 +- .../common/core/exception/UnSupportOperateException.java | 2 +- .../common/core/exception/UnSupportReadException.java | 2 +- .../platform/common/core/function/CollectorsFunction.java | 2 +- .../platform/common/core/function/EntityBaseFunction.java | 2 +- .../cn/bootx/platform/common/core/function/ParamService.java | 2 +- .../platform/common/core/function/SystemKeyValueService.java | 2 +- .../platform/common/core/function/UserDetailService.java | 2 +- .../java/cn/bootx/platform/common/core/rest/ErrorResult.java | 2 +- .../java/cn/bootx/platform/common/core/rest/PageResult.java | 2 +- .../src/main/java/cn/bootx/platform/common/core/rest/Res.java | 2 +- .../java/cn/bootx/platform/common/core/rest/ResResult.java | 2 +- .../java/cn/bootx/platform/common/core/rest/dto/BaseDto.java | 2 +- .../java/cn/bootx/platform/common/core/rest/dto/KeyValue.java | 2 +- .../cn/bootx/platform/common/core/rest/dto/LabelValue.java | 2 +- .../cn/bootx/platform/common/core/rest/param/OrderParam.java | 2 +- .../java/cn/bootx/platform/common/core/util/CertUtil.java | 2 +- .../java/cn/bootx/platform/common/core/util/CollUtil.java | 2 +- .../java/cn/bootx/platform/common/core/util/FileUtil.java | 2 +- .../cn/bootx/platform/common/core/util/LocalDateTimeUtil.java | 2 +- .../cn/bootx/platform/common/core/util/ResultConvertUtil.java | 2 +- .../cn/bootx/platform/common/core/util/TreeBuildUtil.java | 2 +- .../cn/bootx/platform/common/core/util/ValidationUtil.java | 2 +- .../platform/common/core/validation/ValidationGroup.java | 2 +- .../platform/starter/audit/log/AuditLogAutoConfiguration.java | 2 +- .../audit/log/configuration/DataVersionConfiguration.java | 2 +- .../audit/log/controller/DataVersionLogController.java | 2 +- .../starter/audit/log/controller/LoginLogController.java | 2 +- .../starter/audit/log/controller/OperateLogController.java | 2 +- .../starter/audit/log/core/db/convert/LogConvert.java | 2 +- .../audit/log/core/db/dao/DataVersionLogDbManager.java | 2 +- .../starter/audit/log/core/db/dao/DataVersionLogDbMapper.java | 2 +- .../starter/audit/log/core/db/dao/LoginLogDbManager.java | 2 +- .../starter/audit/log/core/db/dao/LoginLogDbMapper.java | 2 +- .../starter/audit/log/core/db/dao/OperateLogDbManager.java | 2 +- .../starter/audit/log/core/db/entity/DataVersionLogDb.java | 2 +- .../platform/starter/audit/log/core/db/entity/LoginLogDb.java | 2 +- .../starter/audit/log/core/db/entity/OperateLogDb.java | 2 +- .../audit/log/core/db/service/DataVersionLogDbService.java | 2 +- .../starter/audit/log/core/db/service/LoginLogDbService.java | 2 +- .../audit/log/core/db/service/OperateLogDbService.java | 2 +- .../starter/audit/log/core/mongo/convert/LogConvert.java | 2 +- .../log/core/mongo/dao/DataVersionLogMongoRepository.java | 2 +- .../audit/log/core/mongo/dao/LoginLogMongoRepository.java | 2 +- .../audit/log/core/mongo/dao/OperateLogMongoRepository.java | 2 +- .../audit/log/core/mongo/entity/DataVersionLogMongo.java | 2 +- .../starter/audit/log/core/mongo/entity/LoginLogMongo.java | 2 +- .../starter/audit/log/core/mongo/entity/OperateLogMongo.java | 2 +- .../log/core/mongo/service/DataVersionLogMongoService.java | 2 +- .../audit/log/core/mongo/service/LoginLogMongoService.java | 2 +- .../audit/log/core/mongo/service/OperateLogMongoService.java | 2 +- .../platform/starter/audit/log/dto/DataVersionLogDto.java | 2 +- .../cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java | 2 +- .../bootx/platform/starter/audit/log/dto/OperateLogDto.java | 2 +- .../starter/audit/log/handler/DataVersionRecordHandler.java | 2 +- .../starter/audit/log/handler/OperateLogAspectHandler.java | 2 +- .../bootx/platform/starter/audit/log/ip2region/IpRegion.java | 2 +- .../starter/audit/log/ip2region/IpToRegionService.java | 2 +- .../platform/starter/audit/log/param/DataVersionLogParam.java | 2 +- .../bootx/platform/starter/audit/log/param/LoginLogParam.java | 2 +- .../platform/starter/audit/log/param/OperateLogParam.java | 2 +- .../starter/audit/log/properties/AuditLogProperties.java | 2 +- .../starter/audit/log/service/DataVersionLogService.java | 2 +- .../platform/starter/audit/log/service/LoginLogService.java | 2 +- .../platform/starter/audit/log/service/OperateLogService.java | 2 +- .../cn/bootx/platform/starter/auth/AuthAutoConfiguration.java | 2 +- .../starter/auth/authentication/AbstractAuthentication.java | 2 +- .../starter/auth/authentication/GetAuthClientService.java | 2 +- .../starter/auth/authentication/GetAuthLoginTypeService.java | 2 +- .../starter/auth/authentication/OpenIdAuthentication.java | 2 +- .../platform/starter/auth/authentication/RouterCheck.java | 2 +- .../auth/authentication/UsernamePasswordAuthentication.java | 2 +- .../bootx/platform/starter/auth/cache/SessionCacheFilter.java | 2 +- .../bootx/platform/starter/auth/cache/SessionCacheLocal.java | 2 +- .../bootx/platform/starter/auth/code/AuthLoginTypeCode.java | 2 +- .../platform/starter/auth/configuration/AuthProperties.java | 2 +- .../platform/starter/auth/configuration/SaTokenConfigure.java | 2 +- .../bootx/platform/starter/auth/endpoint/TokenEndpoint.java | 2 +- .../cn/bootx/platform/starter/auth/endpoint/TokenService.java | 2 +- .../cn/bootx/platform/starter/auth/entity/AuthClient.java | 2 +- .../cn/bootx/platform/starter/auth/entity/AuthInfoResult.java | 2 +- .../cn/bootx/platform/starter/auth/entity/AuthLoginType.java | 2 +- .../bootx/platform/starter/auth/entity/LoginAuthContext.java | 2 +- .../cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java | 2 +- .../starter/auth/exception/ApplicationNotEnableException.java | 2 +- .../starter/auth/exception/ApplicationNotFoundException.java | 2 +- .../starter/auth/exception/ClientNotEnableException.java | 2 +- .../starter/auth/exception/ClientNotFoundException.java | 2 +- .../starter/auth/exception/LoginFailureException.java | 2 +- .../starter/auth/exception/LonginTypeNotFoundException.java | 2 +- .../platform/starter/auth/exception/NotLoginException.java | 2 +- .../platform/starter/auth/exception/RouterCheckException.java | 2 +- .../starter/auth/exception/UserNotFoundException.java | 2 +- .../platform/starter/auth/handler/LoginFailureHandler.java | 2 +- .../platform/starter/auth/handler/LoginSuccessHandler.java | 2 +- .../starter/auth/handler/OpenIdAuthenticationHandler.java | 2 +- .../platform/starter/auth/handler/SaExceptionHandler.java | 2 +- .../bootx/platform/starter/auth/handler/SaRouteHandler.java | 2 +- .../starter/auth/impl/IgnoreAdminUserRouterCheck.java | 2 +- .../starter/auth/impl/IgnoreAnnotationRouterCheck.java | 2 +- .../cn/bootx/platform/starter/auth/online/OnlineUserDto.java | 2 +- .../bootx/platform/starter/auth/online/OnlineUserService.java | 2 +- .../platform/starter/auth/redis/SaTokenRedisProperties.java | 2 +- .../cn/bootx/platform/starter/auth/util/PasswordEncoder.java | 2 +- .../cn/bootx/platform/starter/auth/util/SecurityUtil.java | 2 +- .../platform/starter/code/gen/CodeGenAutoConfiguration.java | 2 +- .../platform/starter/code/gen/code/CodeGenColumnTypeEnum.java | 2 +- .../platform/starter/code/gen/code/CodeGenTemplateVmEnum.java | 2 +- .../starter/code/gen/controller/CodeGeneratorController.java | 2 +- .../starter/code/gen/controller/DatabaseTableController.java | 2 +- .../platform/starter/code/gen/dao/DatabaseTableMapper.java | 2 +- .../bootx/platform/starter/code/gen/domain/CodeGenData.java | 4 ++-- .../bootx/platform/starter/code/gen/dto/CodeGenPreview.java | 2 +- .../bootx/platform/starter/code/gen/dto/TableGenParamDto.java | 2 +- .../bootx/platform/starter/code/gen/entity/CodeGenConfig.java | 2 +- .../platform/starter/code/gen/entity/DatabaseColumn.java | 2 +- .../bootx/platform/starter/code/gen/entity/DatabaseTable.java | 2 +- .../bootx/platform/starter/code/gen/param/CodeGenParam.java | 2 +- .../starter/code/gen/service/CodeGeneratorService.java | 2 +- .../starter/code/gen/service/DatabaseTableService.java | 2 +- .../cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java | 2 +- .../main/resources/codegen/template/java/controller.java.vm | 2 +- .../src/main/resources/codegen/template/java/convert.java.vm | 4 ++-- .../src/main/resources/codegen/template/java/dto.java.vm | 2 +- .../src/main/resources/codegen/template/java/entity.java.vm | 2 +- .../src/main/resources/codegen/template/java/manager.java.vm | 2 +- .../src/main/resources/codegen/template/java/mapper.java.vm | 4 ++-- .../src/main/resources/codegen/template/java/param.java.vm | 2 +- .../src/main/resources/codegen/template/java/service.java.vm | 2 +- .../platform/starter/data/perm/DataPermAutoConfiguration.java | 2 +- .../bootx/platform/starter/data/perm/code/DataScopeEnum.java | 2 +- .../starter/data/perm/configuration/DataPermProperties.java | 2 +- .../data/perm/configuration/DatePermConfiguration.java | 2 +- .../starter/data/perm/dbencrypt/DecryptInterceptor.java | 2 +- .../starter/data/perm/dbencrypt/EncryptInterceptor.java | 2 +- .../starter/data/perm/exception/NotLoginPermException.java | 2 +- .../starter/data/perm/handler/DataPermAspectHandler.java | 2 +- .../starter/data/perm/local/DataPermContextHolder.java | 2 +- .../bootx/platform/starter/data/perm/scope/DataPermScope.java | 2 +- .../starter/data/perm/scope/DataPermScopeHandler.java | 2 +- .../starter/data/perm/scope/DataScopeInterceptor.java | 2 +- .../starter/data/perm/select/SelectFieldPermHandler.java | 2 +- .../starter/data/perm/select/SelectFieldPermInterceptor.java | 2 +- .../platform/starter/data/perm/sensitive/SensitiveInfo.java | 4 ++-- .../starter/data/perm/sensitive/SensitiveInfoSerialize.java | 2 +- .../platform/starter/dingtalk/DingTalkAutoConfiguration.java | 2 +- .../cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java | 2 +- .../platform/starter/dingtalk/code/DingTalkNoticeCode.java | 2 +- .../starter/dingtalk/configuration/DingTalkProperties.java | 2 +- .../dingtalk/controller/DingRobotConfigController.java | 2 +- .../starter/dingtalk/core/base/result/DingTalkResult.java | 2 +- .../starter/dingtalk/core/base/result/MediaResult.java | 2 +- .../starter/dingtalk/core/base/service/DingAccessService.java | 2 +- .../starter/dingtalk/core/media/dao/DingMediaMd5Manager.java | 2 +- .../starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java | 2 +- .../starter/dingtalk/core/media/entity/DingMediaMd5.java | 2 +- .../dingtalk/core/media/service/DingMediaMd5Service.java | 2 +- .../starter/dingtalk/core/media/service/DingMediaService.java | 2 +- .../starter/dingtalk/core/notice/result/ChatNoticeResult.java | 2 +- .../starter/dingtalk/core/notice/result/CorpNoticeResult.java | 2 +- .../dingtalk/core/notice/service/DingNoticeService.java | 2 +- .../starter/dingtalk/core/robot/convert/DingRobotConvert.java | 2 +- .../dingtalk/core/robot/dao/DingRobotConfigManager.java | 2 +- .../dingtalk/core/robot/dao/DingRobotConfigMapper.java | 2 +- .../starter/dingtalk/core/robot/entity/DingRobotConfig.java | 2 +- .../dingtalk/core/robot/service/DingRobotConfigService.java | 2 +- .../dingtalk/core/robot/service/DingRobotSendService.java | 2 +- .../starter/dingtalk/core/user/entity/UserIdResult.java | 2 +- .../starter/dingtalk/core/user/service/DingUserService.java | 2 +- .../platform/starter/dingtalk/param/notice/ChatNotice.java | 2 +- .../platform/starter/dingtalk/param/notice/CorpNotice.java | 2 +- .../starter/dingtalk/param/notice/RecallCorpNotice.java | 2 +- .../starter/dingtalk/param/notice/UpdateCorpNotice.java | 2 +- .../starter/dingtalk/param/notice/msg/ActionCardMsg.java | 2 +- .../bootx/platform/starter/dingtalk/param/notice/msg/At.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/DingMedia.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/FileMsg.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/ImageMsg.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/LinkMsg.java | 2 +- .../starter/dingtalk/param/notice/msg/MarkdownMsg.java | 2 +- .../bootx/platform/starter/dingtalk/param/notice/msg/Msg.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/OaMsg.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/TextMsg.java | 2 +- .../platform/starter/dingtalk/param/notice/msg/VoiceMsg.java | 2 +- .../starter/dingtalk/param/robot/DingRobotConfigParam.java | 2 +- .../cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java | 2 +- .../cn/bootx/platform/starter/file/FileAutoConfiguration.java | 2 +- .../bootx/platform/starter/file/code/FileUploadTypeEnum.java | 2 +- .../starter/file/configuration/FileUploadConfiguration.java | 2 +- .../starter/file/configuration/FileUploadProperties.java | 2 +- .../starter/file/controller/FIleUpLoadController.java | 2 +- .../cn/bootx/platform/starter/file/convert/FileConvert.java | 2 +- .../cn/bootx/platform/starter/file/dao/UpdateFileManager.java | 2 +- .../cn/bootx/platform/starter/file/dao/UpdateFileMapper.java | 2 +- .../cn/bootx/platform/starter/file/dto/UpdateFileDto.java | 2 +- .../cn/bootx/platform/starter/file/entity/UpdateFileInfo.java | 2 +- .../bootx/platform/starter/file/entity/UploadFileContext.java | 2 +- .../platform/starter/file/service/FileUploadService.java | 2 +- .../cn/bootx/platform/starter/file/service/UploadService.java | 2 +- .../starter/file/service/impl/LocalUploadService.java | 2 +- .../starter/file/service/impl/MinioUploadService.java | 2 +- .../starter/file/service/impl/MongoUploadService.java | 2 +- .../platform/starter/file/service/impl/OssUploadService.java | 2 +- .../platform/starter/monitor/MonitorAutoConfiguration.java | 2 +- .../starter/monitor/controller/SystemMonitorController.java | 2 +- .../platform/starter/monitor/entity/MongoMonitorResult.java | 2 +- .../platform/starter/monitor/entity/RedisMonitorResult.java | 2 +- .../platform/starter/monitor/entity/SystemMonitorResult.java | 2 +- .../platform/starter/monitor/service/RedisMonitorService.java | 2 +- .../starter/monitor/service/SystemMonitorService.java | 2 +- bootx-common-starters/common-starter-quartz/README.md | 2 +- .../platform/starter/quartz/QuartzJobAutoConfiguration.java | 2 +- .../cn/bootx/platform/starter/quartz/code/QuartzJobCode.java | 2 +- .../starter/quartz/configuration/QuartzProperties.java | 2 +- .../starter/quartz/controller/QuartzJobController.java | 2 +- .../starter/quartz/controller/QuartzJobLogController.java | 2 +- .../starter/quartz/core/convert/QuartzJobConvert.java | 2 +- .../platform/starter/quartz/core/dao/QuartzJobLogManager.java | 2 +- .../platform/starter/quartz/core/dao/QuartzJobLogMapper.java | 2 +- .../platform/starter/quartz/core/dao/QuartzJobManager.java | 2 +- .../platform/starter/quartz/core/dao/QuartzJobMapper.java | 2 +- .../bootx/platform/starter/quartz/core/entity/QuartzJob.java | 2 +- .../platform/starter/quartz/core/entity/QuartzJobLog.java | 2 +- .../starter/quartz/core/service/QuartzJobLogService.java | 2 +- .../starter/quartz/core/service/QuartzJobService.java | 2 +- .../cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java | 2 +- .../cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java | 2 +- .../platform/starter/quartz/handler/JobLogAspectHandler.java | 2 +- .../platform/starter/quartz/handler/QuartzJobScheduler.java | 2 +- .../platform/starter/quartz/param/QuartzJobLogQuery.java | 2 +- .../bootx/platform/starter/quartz/param/QuartzJobParam.java | 2 +- .../java/cn/bootx/platform/starter/quartz/task/TestTask.java | 2 +- .../platform/starter/wechat/WeChatAutoConfiguration.java | 2 +- .../cn/bootx/platform/starter/wechat/code/WeChatCode.java | 2 +- .../starter/wechat/configuration/WeChatConfiguration.java | 2 +- .../configuration/WeChatMessageRouterConfiguration.java | 2 +- .../starter/wechat/configuration/WeChatProperties.java | 2 +- .../starter/wechat/controller/WeChatArticleController.java | 2 +- .../starter/wechat/controller/WeChatMediaController.java | 2 +- .../starter/wechat/controller/WeChatMenuController.java | 2 +- .../starter/wechat/controller/WeChatPortalController.java | 2 +- .../starter/wechat/controller/WeChatQrLoginController.java | 2 +- .../starter/wechat/controller/WeChatTemplateController.java | 2 +- .../wechat/core/article/service/WeChatArticleService.java | 2 +- .../wechat/core/login/service/WeChatQrLoginService.java | 2 +- .../starter/wechat/core/media/service/WeChatMediaService.java | 2 +- .../starter/wechat/core/menu/convert/WeChatMenuConvert.java | 2 +- .../starter/wechat/core/menu/dao/WeChatMenuManager.java | 2 +- .../starter/wechat/core/menu/dao/WeChatMenuMapper.java | 2 +- .../starter/wechat/core/menu/domin/WeChatMenuInfo.java | 2 +- .../platform/starter/wechat/core/menu/entity/WeChatMenu.java | 2 +- .../starter/wechat/core/menu/service/WeChatMenuService.java | 2 +- .../wechat/core/notice/convert/WeChatTemplateConvert.java | 2 +- .../starter/wechat/core/notice/dao/WeChatTemplateManager.java | 2 +- .../starter/wechat/core/notice/dao/WeChatTemplateMapper.java | 2 +- .../starter/wechat/core/notice/entity/WeChatTemplate.java | 2 +- .../wechat/core/notice/service/WeChatTemplateService.java | 2 +- .../wechat/core/notice/service/WechatNoticeService.java | 2 +- .../wechat/core/portal/service/WeChatPortalService.java | 2 +- .../starter/wechat/core/user/convert/WechatFansConvert.java | 2 +- .../starter/wechat/core/user/dao/WechatFansManager.java | 2 +- .../starter/wechat/core/user/dao/WechatFansMapper.java | 2 +- .../platform/starter/wechat/core/user/entity/WechatFans.java | 2 +- .../starter/wechat/core/user/service/WeChatUserService.java | 2 +- .../platform/starter/wechat/dto/article/WeChatArticleDto.java | 2 +- .../platform/starter/wechat/dto/login/WeChatLoginQrCode.java | 2 +- .../platform/starter/wechat/dto/media/WeChatMediaDto.java | 2 +- .../bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java | 2 +- .../platform/starter/wechat/dto/notice/WeChatTemplateDto.java | 2 +- .../bootx/platform/starter/wechat/dto/user/WechatFansDto.java | 2 +- .../platform/starter/wechat/event/WeChatQrScanEvent.java | 2 +- .../starter/wechat/handler/WeChatMpMessageHandler.java | 2 +- .../platform/starter/wechat/handler/WeChatMsgHandler.java | 2 +- .../platform/starter/wechat/handler/WeChatQrScanHandler.java | 2 +- .../starter/wechat/handler/WeChatSubscribeHandler.java | 2 +- .../starter/wechat/handler/WeChatUnSubscribeHandler.java | 2 +- .../platform/starter/wechat/handler/WechatMenuHandler.java | 2 +- .../starter/wechat/handler/qrscene/WeChatQrLoginHandler.java | 2 +- .../wechat/handler/qrscene/WeChatQrSceneMsgHandler.java | 2 +- .../platform/starter/wechat/param/menu/WeChatMenuParam.java | 2 +- .../starter/wechat/param/notice/WeChatTemplateParam.java | 2 +- .../starter/wechat/param/portal/WeChatPortalParam.java | 2 +- .../platform/starter/wechat/param/user/WechatFansParam.java | 2 +- .../cn/bootx/platform/starter/wechat/util/WeChatUtil.java | 2 +- .../bootx/platform/starter/wecom/WeComAutoConfiguration.java | 2 +- .../java/cn/bootx/platform/starter/wecom/code/WeComCode.java | 2 +- .../starter/wecom/configuration/WeComConfiguration.java | 2 +- .../platform/starter/wecom/configuration/WeComProperties.java | 2 +- .../starter/wecom/controller/WecomRobotConfigController.java | 2 +- .../core/notice/executor/RecallNoticeRequestExecutor.java | 2 +- .../starter/wecom/core/notice/service/WeComNoticeService.java | 2 +- .../wecom/core/robot/convert/WecomRobotConfigConvert.java | 2 +- .../starter/wecom/core/robot/dao/WecomRobotConfigManager.java | 2 +- .../starter/wecom/core/robot/dao/WecomRobotConfigMapper.java | 2 +- .../platform/starter/wecom/core/robot/domin/UploadMedia.java | 2 +- .../starter/wecom/core/robot/entity/WecomRobotConfig.java | 2 +- .../robot/executor/RobotMediaFileUploadRequestExecutor.java | 2 +- .../wecom/core/robot/service/WeComRobotNoticeService.java | 2 +- .../wecom/core/robot/service/WecomRobotConfigService.java | 2 +- .../platform/starter/wecom/dto/robot/WecomRobotConfigDto.java | 2 +- .../starter/wecom/param/robot/WecomRobotConfigParam.java | 2 +- .../bootx/platform/common/cache/CacheAutoConfiguration.java | 2 +- .../platform/common/cache/configuration/BootxRedisCache.java | 2 +- .../common/cache/configuration/BootxRedisCacheManager.java | 2 +- .../platform/common/cache/manager/CachingConfiguration.java | 2 +- .../platform/common/cache/manager/CachingProperties.java | 2 +- .../common/translate/DataTranslateAutoConfiguration.java | 2 +- .../common/translate/aop/TranslationAnnotationAdvisor.java | 2 +- .../platform/common/translate/aop/TranslationInterceptor.java | 2 +- .../common/translate/cache/TranslationCacheFilter.java | 2 +- .../common/translate/cache/TranslationCacheLocal.java | 2 +- .../common/translate/cache/TranslationCacheService.java | 2 +- .../bootx/platform/common/translate/domain/ConvertInfo.java | 2 +- .../platform/common/translate/handler/TranslationHandler.java | 2 +- .../handler/impl/ResultObjectTranslationHandler.java | 2 +- .../handler/impl/ResultPageIterableTranslationHandler.java | 2 +- .../translate/handler/impl/ResultPageTranslationHandler.java | 2 +- .../common/translate/service/DictTranslationService.java | 2 +- .../common/translate/service/FieldTranslationService.java | 2 +- .../exceptionhandler/ExceptionHandlerAutoConfiguration.java | 2 +- .../exceptionhandler/handler/ExceptionHandlerProperties.java | 2 +- .../common/exceptionhandler/handler/RestExceptionHandler.java | 2 +- .../cn/bootx/platform/common/headerholder/HeaderHolder.java | 2 +- .../headerholder/filter/WebHeaderHolderInterceptor.java | 2 +- .../common/headerholder/local/HolderContextHolder.java | 2 +- .../bootx/platform/common/idempotency/aop/IdempotentAop.java | 2 +- .../platform/common/jackson/JacksonAutoConfiguration.java | 2 +- .../common/jackson/configuration/JacksonConfiguration.java | 2 +- .../cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java | 2 +- .../bootx/platform/common/jackson/jdk/JavaLongTypeModule.java | 2 +- .../cn/bootx/platform/common/jackson/util/JacksonUtil.java | 2 +- .../cn/bootx/platform/common/log/LogAutoConfiguration.java | 2 +- .../platform/common/log/configuration/LogProperties.java | 2 +- .../common/log/handler/LogTraceHeaderHolderFilter.java | 2 +- .../common/log/handler/SensitiveDataLogConverter.java | 2 +- .../platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java | 2 +- .../src/main/java/org/slf4j/impl/StaticMDCBinder.java | 2 +- .../src/main/java/org/slf4j/impl/TtlMDCAdapter.java | 2 +- .../platform/common/mongo/MongoCommonAutoConfiguration.java | 2 +- .../platform/common/mongo/config/MongoConfiguration.java | 2 +- .../mybatisplus/MybatisPlusCommonAutoConfiguration.java | 2 +- .../bootx/platform/common/mybatisplus/base/MpBaseEntity.java | 2 +- .../platform/common/mybatisplus/base/MpCreateEntity.java | 2 +- .../bootx/platform/common/mybatisplus/base/MpDelEntity.java | 2 +- .../cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java | 2 +- .../common/mybatisplus/configuration/MpConfiguration.java | 2 +- .../extension/DataChangeRecorderInnerInterceptor.java | 4 ++-- .../common/mybatisplus/handler/JacksonRawTypeHandler.java | 2 +- .../mybatisplus/handler/SnowflakeIdentifierGenerator.java | 2 +- .../bootx/platform/common/mybatisplus/impl/BaseManager.java | 2 +- .../common/mybatisplus/interceptor/MpInterceptor.java | 2 +- .../mybatisplus/interceptor/MpInterceptorConfiguration.java | 2 +- .../cn/bootx/platform/common/mybatisplus/util/MpUtil.java | 2 +- .../common/rabbit/RabbitMqCommonAutoConfiguration.java | 2 +- .../common/rabbit/conditional/ConditionalOnRabbit.java | 2 +- .../platform/common/rabbit/conditional/OnRabbitEnable.java | 2 +- .../rabbit/configuration/BootxRabbitListenerConfigurer.java | 2 +- .../common/rabbit/configuration/RabbitMqConfigurer.java | 2 +- .../common/rabbit/configuration/RabbitMqProperties.java | 2 +- .../java/cn/bootx/platform/common/redis/RedisApplication.java | 2 +- .../main/java/cn/bootx/platform/common/redis/RedisClient.java | 2 +- .../java/cn/bootx/platform/common/redis/code/RedisCode.java | 2 +- .../common/redis/configuration/RedisAutoConfiguration.java | 2 +- .../common/redis/listener/RedisKeyExpiredListener.java | 2 +- .../common/redis/listener/RedisKeyExpiredReceiver.java | 2 +- .../platform/common/redis/listener/RedisTopicListener.java | 2 +- .../platform/common/redis/listener/RedisTopicReceiver.java | 2 +- .../common/redis/redisson/RedissonClientTemporary.java | 2 +- .../platform/common/redis/redisson/RedissonConfiguration.java | 2 +- .../platform/common/redis/redisson/RedissonLoadListener.java | 2 +- .../platform/common/sequence/SequenceAutoConfiguration.java | 2 +- .../common/sequence/configuration/SequenceConfiguration.java | 2 +- .../common/sequence/configuration/SequenceProperties.java | 2 +- .../platform/common/sequence/impl/DefaultRangeSequence.java | 2 +- .../bootx/platform/common/sequence/range/SeqRangeConfig.java | 2 +- .../platform/common/sequence/range/jdbc/JdbcRangeHandler.java | 2 +- .../common/sequence/range/jdbc/JdbcSeqRangeManager.java | 2 +- .../platform/common/sequence/range/jdbc/SequenceRange.java | 2 +- .../common/sequence/range/jdbc/SequenceRangeManager.java | 2 +- .../common/sequence/range/jdbc/SequenceRangeMapper.java | 2 +- .../common/sequence/range/mongo/MongoRangeHandler.java | 2 +- .../common/sequence/range/mongo/MongoSeqRangeManager.java | 2 +- .../platform/common/sequence/range/mongo/SequenceRange.java | 2 +- .../common/sequence/range/redis/RedisSeqRangeManager.java | 2 +- .../cn/bootx/platform/common/sequence/util/SequenceUtil.java | 2 +- .../bootx/platform/common/spring/SpringConfigApplication.java | 2 +- .../cn/bootx/platform/common/spring/aop/CountTimeAop.java | 2 +- .../spring/configuration/AsyncExecutorConfiguration.java | 2 +- .../common/spring/configuration/SpringCorsConfiguration.java | 2 +- .../spring/configuration/SpringExecutorConfiguration.java | 2 +- .../common/spring/configuration/SpringProperties.java | 4 ++-- .../platform/common/spring/exception/RetryableException.java | 2 +- .../java/cn/bootx/platform/common/spring/util/AopUtil.java | 2 +- .../cn/bootx/platform/common/spring/util/WebServletUtil.java | 2 +- .../java/cn/bootx/platform/common/query/QueryApplication.java | 2 +- .../cn/bootx/platform/common/query/code/CompareTypeEnum.java | 2 +- .../cn/bootx/platform/common/query/code/ParamTypeEnum.java | 2 +- .../bootx/platform/common/query/entity/QueryBetweenParam.java | 2 +- .../cn/bootx/platform/common/query/entity/QueryOrder.java | 2 +- .../cn/bootx/platform/common/query/entity/QueryParam.java | 2 +- .../cn/bootx/platform/common/query/entity/QueryParams.java | 2 +- .../common/query/generator/AnnotationQueryGenerator.java | 2 +- .../common/query/generator/ParamValueTypeConvert.java | 2 +- .../bootx/platform/common/query/generator/QueryGenerator.java | 2 +- .../platform/common/query/generator/SuperQueryGenerator.java | 2 +- .../platform/common/swagger/SwaggerAutoConfiguration.java | 2 +- .../cn/bootx/platform/common/swagger/SwaggerProperties.java | 2 +- .../platform/common/websocket/WebsocketAutoConfiguration.java | 2 +- .../bootx/platform/common/websocket/code/WebsocketCode.java | 2 +- .../common/websocket/configuration/WebSocketConfig.java | 2 +- .../java/cn/bootx/platform/common/websocket/entity/WsRes.java | 2 +- .../cn/bootx/platform/common/websocket/entity/WsResult.java | 2 +- .../platform/common/websocket/func/WsUserAuthService.java | 2 +- .../websocket/manager/SpringWebSocketSessionManager.java | 2 +- .../common/websocket/manager/WebSocketSessionManager.java | 2 +- .../common/websocket/notice/UserNoticeWebSocketHandler.java | 2 +- .../websocket/notice/UserNoticeWebSocketInterceptor.java | 2 +- .../common/websocket/service/UserWsNoticeService.java | 2 +- .../cn/bootx/platform/common/xxljob/JobAutoConfiguration.java | 2 +- .../cn/bootx/platform/common/xxljob/XxlJobProperties.java | 2 +- .../src/main/java/cn/bootx/platform/demo/DemoApplication.java | 2 +- .../demo/controller/bsp/DictConvertDemoController.java | 2 +- .../demo/controller/data/DataEncryptDemoController.java | 2 +- .../platform/demo/controller/data/DataPermDemoController.java | 2 +- .../demo/controller/data/DataSensitiveDemoController.java | 2 +- .../demo/controller/lock/IdempotencyDemoController.java | 2 +- .../demo/controller/mq/MessageQueueDemoController.java | 2 +- .../demo/controller/notice/EmailSendDemoController.java | 2 +- .../demo/controller/query/SuperQueryDemoController.java | 2 +- .../demo/controller/ws/GlobalWebsocketDemoController.java | 2 +- .../demo/core/encrypt/dao/DataEncryptDemoManager.java | 2 +- .../platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java | 2 +- .../platform/demo/core/encrypt/entity/DataEncryptDemo.java | 2 +- .../demo/core/encrypt/service/DataEncryptDemoService.java | 2 +- .../platform/demo/core/mq/mqtt/DemoMqttConfiguration.java | 2 +- .../platform/demo/core/mq/mqtt/DemoMqttMessageListener.java | 2 +- .../demo/core/mq/rabbit/DemoRabbitMqConfiguration.java | 2 +- .../demo/core/mq/rabbit/DemoRabbitMqMessageListener.java | 2 +- .../platform/demo/core/mq/redis/DemoRedisExpiredListener.java | 2 +- .../platform/demo/core/mq/redis/DemoRedisStreamListener.java | 2 +- .../platform/demo/core/mq/redis/DemoRedisTopicListener.java | 2 +- .../bootx/platform/demo/core/mtm/entity/MtmTableEntity.java | 2 +- .../demo/core/notice/entity/SendSimpleEmailDemoParam.java | 2 +- .../demo/core/notice/service/EmailSendDemoService.java | 2 +- .../platform/demo/core/perm/dao/DataPermDemoManager.java | 2 +- .../bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java | 2 +- .../cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java | 2 +- .../platform/demo/core/perm/service/DataPermDemoService.java | 2 +- .../platform/demo/core/query/dao/SuperQueryDemoManager.java | 2 +- .../platform/demo/core/query/dao/SuperQueryDemoMapper.java | 2 +- .../bootx/platform/demo/core/query/entity/SuperQueryDemo.java | 2 +- .../demo/core/query/service/SuperQueryDemoService.java | 2 +- .../demo/core/sensitive/dao/DataSensitiveDemoManager.java | 2 +- .../demo/core/sensitive/dao/DataSensitiveDemoMapper.java | 2 +- .../demo/core/sensitive/entity/DataSensitiveDemo.java | 2 +- .../demo/core/sensitive/service/DataSensitiveDemoService.java | 2 +- .../main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java | 2 +- .../java/cn/bootx/platform/baseapi/BaseApiApplication.java | 2 +- .../main/java/cn/bootx/platform/baseapi/code/CachingCode.java | 2 +- .../java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java | 2 +- .../java/cn/bootx/platform/baseapi/code/QuerySqlCode.java | 2 +- .../platform/baseapi/controller/AppVersionController.java | 2 +- .../bootx/platform/baseapi/controller/CaptchaController.java | 2 +- .../platform/baseapi/controller/ChinaRegionController.java | 2 +- .../platform/baseapi/controller/DictionaryController.java | 2 +- .../platform/baseapi/controller/DictionaryItemController.java | 2 +- .../baseapi/controller/DynamicDataSourceController.java | 2 +- .../platform/baseapi/controller/DynamicFormController.java | 2 +- .../baseapi/controller/DynamicFormDataController.java | 2 +- .../bootx/platform/baseapi/controller/QuerySqlController.java | 2 +- .../platform/baseapi/controller/SystemParamController.java | 2 +- .../platform/baseapi/core/app/convert/AppVersionConvert.java | 2 +- .../platform/baseapi/core/app/dao/AppVersionManager.java | 2 +- .../bootx/platform/baseapi/core/app/dao/AppVersionMapper.java | 2 +- .../cn/bootx/platform/baseapi/core/app/entity/AppVersion.java | 2 +- .../platform/baseapi/core/app/service/AppVersionService.java | 2 +- .../platform/baseapi/core/captcha/service/CaptchaService.java | 2 +- .../platform/baseapi/core/dict/convert/DictionaryConvert.java | 2 +- .../platform/baseapi/core/dict/dao/DictionaryItemManager.java | 2 +- .../platform/baseapi/core/dict/dao/DictionaryItemMapper.java | 2 +- .../platform/baseapi/core/dict/dao/DictionaryManager.java | 2 +- .../platform/baseapi/core/dict/dao/DictionaryMapper.java | 2 +- .../bootx/platform/baseapi/core/dict/entity/Dictionary.java | 2 +- .../platform/baseapi/core/dict/entity/DictionaryItem.java | 2 +- .../baseapi/core/dict/service/DictTranslationServiceImpl.java | 2 +- .../baseapi/core/dict/service/DictionaryItemService.java | 2 +- .../platform/baseapi/core/dict/service/DictionaryService.java | 2 +- .../baseapi/core/dynamicform/convert/DynamicFormConvert.java | 2 +- .../baseapi/core/dynamicform/dao/DynamicFormManager.java | 2 +- .../baseapi/core/dynamicform/dao/DynamicFormMapper.java | 2 +- .../platform/baseapi/core/dynamicform/entity/DynamicForm.java | 2 +- .../baseapi/core/dynamicform/entity/DynamicFormData.java | 2 +- .../core/dynamicform/service/DynamicFormDataService.java | 2 +- .../baseapi/core/dynamicform/service/DynamicFormService.java | 2 +- .../core/dynamicsource/convert/DynamicDataSourceConvert.java | 2 +- .../core/dynamicsource/dao/DynamicDataSourceManager.java | 2 +- .../core/dynamicsource/dao/DynamicDataSourceMapper.java | 2 +- .../baseapi/core/dynamicsource/entity/DynamicDataSource.java | 2 +- .../core/dynamicsource/service/DynamicDataSourceService.java | 2 +- .../baseapi/core/keyvalue/dao/SysKeyValueManager.java | 2 +- .../platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java | 2 +- .../platform/baseapi/core/keyvalue/entity/SysKeyValue.java | 2 +- .../baseapi/core/keyvalue/service/SysKeyValueService.java | 2 +- .../baseapi/core/parameter/convert/SystemConvert.java | 2 +- .../baseapi/core/parameter/dao/SystemParamManager.java | 2 +- .../baseapi/core/parameter/dao/SystemParamMapper.java | 2 +- .../baseapi/core/parameter/entity/SystemParameter.java | 2 +- .../baseapi/core/parameter/service/SystemParamService.java | 2 +- .../bootx/platform/baseapi/core/region/dao/AreaManager.java | 2 +- .../cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java | 2 +- .../bootx/platform/baseapi/core/region/dao/CityManager.java | 2 +- .../cn/bootx/platform/baseapi/core/region/dao/CityMapper.java | 2 +- .../platform/baseapi/core/region/dao/ProvinceManager.java | 2 +- .../platform/baseapi/core/region/dao/ProvinceMapper.java | 2 +- .../bootx/platform/baseapi/core/region/dao/StreetManager.java | 2 +- .../bootx/platform/baseapi/core/region/dao/StreetMapper.java | 2 +- .../platform/baseapi/core/region/dao/VillageManager.java | 2 +- .../bootx/platform/baseapi/core/region/dao/VillageMapper.java | 2 +- .../cn/bootx/platform/baseapi/core/region/entity/Area.java | 2 +- .../cn/bootx/platform/baseapi/core/region/entity/City.java | 2 +- .../bootx/platform/baseapi/core/region/entity/Province.java | 2 +- .../cn/bootx/platform/baseapi/core/region/entity/Street.java | 2 +- .../cn/bootx/platform/baseapi/core/region/entity/Village.java | 2 +- .../baseapi/core/region/service/ChinaRegionService.java | 2 +- .../platform/baseapi/core/sql/convert/QuerySqlConvert.java | 2 +- .../bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java | 2 +- .../bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java | 2 +- .../cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java | 2 +- .../platform/baseapi/core/sql/service/QuerySqlService.java | 2 +- .../java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java | 2 +- .../bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java | 2 +- .../cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java | 2 +- .../cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java | 2 +- .../platform/baseapi/dto/dict/DictionaryItemSimpleDto.java | 2 +- .../platform/baseapi/dto/dynamicform/DynamicFormDto.java | 2 +- .../baseapi/dto/dynamicsource/DynamicDataSourceDto.java | 2 +- .../platform/baseapi/dto/parameter/SystemParameterDto.java | 2 +- .../java/cn/bootx/platform/baseapi/dto/region/RegionDto.java | 2 +- .../java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java | 2 +- .../baseapi/exception/dict/DictAlreadyExistedException.java | 2 +- .../baseapi/exception/dict/DictChildItemExistedException.java | 2 +- .../exception/dict/DictItemAlreadyExistedException.java | 2 +- .../baseapi/exception/dict/DictItemAlreadyUsedException.java | 2 +- .../baseapi/exception/dict/DictItemNotExistedException.java | 2 +- .../baseapi/exception/dict/DictNotExistedException.java | 2 +- .../handler/dynamicsource/DynamicDataSourceLoadHandler.java | 2 +- .../platform/baseapi/handler/mp/MpMetaObjectHandler.java | 2 +- .../baseapi/handler/region/ChinaRegionInitSqlHandler.java | 2 +- .../cn/bootx/platform/baseapi/param/app/AppVersionParam.java | 2 +- .../platform/baseapi/param/dict/DictionaryItemParam.java | 2 +- .../cn/bootx/platform/baseapi/param/dict/DictionaryParam.java | 2 +- .../platform/baseapi/param/dynamicform/DynamicFormParam.java | 2 +- .../baseapi/param/dynamicsource/DynamicDataSourceParam.java | 2 +- .../cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java | 2 +- .../cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java | 2 +- .../platform/baseapi/param/system/SystemParameterParam.java | 2 +- .../src/main/java/cn/bootx/platform/iam/IamApplication.java | 2 +- .../src/main/java/cn/bootx/platform/iam/code/CachingCode.java | 2 +- .../main/java/cn/bootx/platform/iam/code/IamErrorCode.java | 2 +- .../main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java | 2 +- .../main/java/cn/bootx/platform/iam/code/PermissionCode.java | 2 +- .../main/java/cn/bootx/platform/iam/code/UserStatusCode.java | 2 +- .../bootx/platform/iam/controller/AuthAssistController.java | 2 +- .../cn/bootx/platform/iam/controller/ClientController.java | 2 +- .../cn/bootx/platform/iam/controller/DataScopeController.java | 2 +- .../java/cn/bootx/platform/iam/controller/DeptController.java | 2 +- .../cn/bootx/platform/iam/controller/LoginTypeController.java | 2 +- .../cn/bootx/platform/iam/controller/PermMenuController.java | 2 +- .../cn/bootx/platform/iam/controller/PermPathController.java | 2 +- .../java/cn/bootx/platform/iam/controller/RoleController.java | 2 +- .../cn/bootx/platform/iam/controller/RoleMenuController.java | 2 +- .../cn/bootx/platform/iam/controller/RolePathController.java | 2 +- .../bootx/platform/iam/controller/ThirdLoginController.java | 2 +- .../cn/bootx/platform/iam/controller/UserAdminController.java | 2 +- .../bootx/platform/iam/controller/UserAssistController.java | 2 +- .../platform/iam/controller/UserDataScopeController.java | 2 +- .../cn/bootx/platform/iam/controller/UserDeptController.java | 2 +- .../cn/bootx/platform/iam/controller/UserInfoController.java | 2 +- .../cn/bootx/platform/iam/controller/UserRoleController.java | 2 +- .../cn/bootx/platform/iam/controller/UserThirdController.java | 2 +- .../iam/core/auth/handler/GetAuthClientServiceImpl.java | 2 +- .../iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java | 2 +- .../iam/core/auth/handler/LoginFailureHandlerImpl.java | 2 +- .../iam/core/auth/handler/LoginSuccessHandlerImpl.java | 2 +- .../platform/iam/core/auth/login/DingTalkLoginHandler.java | 2 +- .../platform/iam/core/auth/login/PasswordLoginHandler.java | 2 +- .../bootx/platform/iam/core/auth/login/PhoneLoginHandler.java | 2 +- .../platform/iam/core/auth/login/WeChatLoginHandler.java | 2 +- .../platform/iam/core/auth/login/WeChatOpenLoginHandler.java | 2 +- .../bootx/platform/iam/core/auth/login/WeComLoginHandler.java | 2 +- .../platform/iam/core/auth/service/AuthAssistService.java | 2 +- .../platform/iam/core/auth/service/ThirdLoginService.java | 2 +- .../bootx/platform/iam/core/client/convert/ClientConvert.java | 2 +- .../platform/iam/core/client/convert/LoginTypeConvert.java | 2 +- .../cn/bootx/platform/iam/core/client/dao/ClientManager.java | 2 +- .../cn/bootx/platform/iam/core/client/dao/ClientMapper.java | 2 +- .../bootx/platform/iam/core/client/dao/LoginTypeManager.java | 2 +- .../bootx/platform/iam/core/client/dao/LoginTypeMapper.java | 2 +- .../java/cn/bootx/platform/iam/core/client/entity/Client.java | 2 +- .../cn/bootx/platform/iam/core/client/entity/LonginType.java | 2 +- .../bootx/platform/iam/core/client/service/ClientService.java | 2 +- .../platform/iam/core/client/service/LoginTypeService.java | 2 +- .../cn/bootx/platform/iam/core/dept/convert/DeptConvert.java | 2 +- .../java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java | 2 +- .../java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java | 2 +- .../java/cn/bootx/platform/iam/core/dept/entity/Dept.java | 2 +- .../bootx/platform/iam/core/dept/event/DeptDeleteEvent.java | 2 +- .../bootx/platform/iam/core/dept/service/DeptRuleService.java | 2 +- .../cn/bootx/platform/iam/core/dept/service/DeptService.java | 2 +- .../platform/iam/core/permission/convert/PermConvert.java | 2 +- .../platform/iam/core/permission/dao/PermMenuManager.java | 2 +- .../platform/iam/core/permission/dao/PermMenuMapper.java | 2 +- .../platform/iam/core/permission/dao/PermPathManager.java | 2 +- .../platform/iam/core/permission/dao/PermPathMapper.java | 2 +- .../bootx/platform/iam/core/permission/entity/PermMenu.java | 2 +- .../bootx/platform/iam/core/permission/entity/PermPath.java | 2 +- .../platform/iam/core/permission/entity/RequestPath.java | 2 +- .../platform/iam/core/permission/service/PermCodeService.java | 2 +- .../platform/iam/core/permission/service/PermMenuService.java | 2 +- .../platform/iam/core/permission/service/PermPathService.java | 2 +- .../iam/core/permission/service/RequestPathService.java | 2 +- .../java/cn/bootx/platform/iam/core/role/dao/RoleManager.java | 2 +- .../java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java | 2 +- .../java/cn/bootx/platform/iam/core/role/entity/Role.java | 2 +- .../cn/bootx/platform/iam/core/role/service/RoleService.java | 2 +- .../platform/iam/core/scope/convert/DataScopeConvert.java | 2 +- .../platform/iam/core/scope/dao/DataScopeDeptManager.java | 2 +- .../platform/iam/core/scope/dao/DataScopeDeptMapper.java | 2 +- .../bootx/platform/iam/core/scope/dao/DataScopeManager.java | 2 +- .../cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java | 2 +- .../platform/iam/core/scope/dao/DataScopeUserManager.java | 2 +- .../platform/iam/core/scope/dao/DataScopeUserMapper.java | 2 +- .../cn/bootx/platform/iam/core/scope/entity/DataScope.java | 2 +- .../bootx/platform/iam/core/scope/entity/DataScopeDept.java | 2 +- .../bootx/platform/iam/core/scope/entity/DataScopeUser.java | 2 +- .../platform/iam/core/scope/service/DataScopeService.java | 2 +- .../platform/iam/core/scope/service/DataScopeUserService.java | 2 +- .../platform/iam/core/third/convert/UserThirdInfoConvert.java | 2 +- .../platform/iam/core/third/dao/UserThirdInfoManager.java | 2 +- .../platform/iam/core/third/dao/UserThirdInfoMapper.java | 2 +- .../bootx/platform/iam/core/third/dao/UserThirdManager.java | 2 +- .../cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java | 2 +- .../cn/bootx/platform/iam/core/third/entity/UserThird.java | 2 +- .../bootx/platform/iam/core/third/entity/UserThirdInfo.java | 2 +- .../platform/iam/core/third/service/UserThirdBindService.java | 2 +- .../iam/core/third/service/UserThirdQueryService.java | 2 +- .../iam/core/third/service/UserTiredOperateService.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/RolePathManager.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java | 2 +- .../platform/iam/core/upms/dao/UserDataScopeManager.java | 2 +- .../bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java | 2 +- .../cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java | 2 +- .../java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java | 2 +- .../java/cn/bootx/platform/iam/core/upms/entity/RolePath.java | 2 +- .../cn/bootx/platform/iam/core/upms/entity/UserDataScope.java | 2 +- .../java/cn/bootx/platform/iam/core/upms/entity/UserRole.java | 2 +- .../bootx/platform/iam/core/upms/service/RolePathService.java | 2 +- .../bootx/platform/iam/core/upms/service/RolePermService.java | 2 +- .../platform/iam/core/upms/service/UserDataScopeService.java | 2 +- .../bootx/platform/iam/core/upms/service/UserRoleService.java | 2 +- .../cn/bootx/platform/iam/core/user/dao/UserDeptManager.java | 2 +- .../cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java | 2 +- .../platform/iam/core/user/dao/UserExpandInfoManager.java | 2 +- .../platform/iam/core/user/dao/UserExpandInfoMapper.java | 2 +- .../cn/bootx/platform/iam/core/user/dao/UserInfoManager.java | 2 +- .../cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java | 2 +- .../java/cn/bootx/platform/iam/core/user/entity/UserDept.java | 2 +- .../bootx/platform/iam/core/user/entity/UserExpandInfo.java | 2 +- .../java/cn/bootx/platform/iam/core/user/entity/UserInfo.java | 2 +- .../bootx/platform/iam/core/user/event/UserCreateEvent.java | 2 +- .../platform/iam/core/user/service/UserAdminService.java | 2 +- .../platform/iam/core/user/service/UserAssistService.java | 2 +- .../bootx/platform/iam/core/user/service/UserDeptService.java | 2 +- .../platform/iam/core/user/service/UserExpandInfoService.java | 2 +- .../bootx/platform/iam/core/user/service/UserInfoService.java | 2 +- .../platform/iam/core/user/service/UserQueryService.java | 2 +- .../java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java | 2 +- .../java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java | 2 +- .../main/java/cn/bootx/platform/iam/dto/client/ClientDto.java | 2 +- .../java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java | 2 +- .../src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java | 2 +- .../java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java | 2 +- .../cn/bootx/platform/iam/dto/permission/PermMenuDto.java | 2 +- .../java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java | 2 +- .../cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java | 2 +- .../cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java | 2 +- .../cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java | 2 +- .../java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java | 2 +- .../cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java | 2 +- .../main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java | 2 +- .../java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java | 2 +- .../cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java | 2 +- .../java/cn/bootx/platform/iam/dto/user/UserThirdDto.java | 2 +- .../java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java | 2 +- .../iam/exception/login/UserPasswordInvalidException.java | 2 +- .../iam/exception/permission/PermissionDBErrorException.java | 2 +- .../iam/exception/role/RoleAlreadyExistedException.java | 2 +- .../platform/iam/exception/role/RoleAlreadyUsedException.java | 2 +- .../platform/iam/exception/role/RoleNotExistedException.java | 2 +- .../iam/exception/user/UserInfoNotExistsException.java | 2 +- .../iam/exception/user/UserNonePhoneAndEmailException.java | 2 +- .../iam/exception/user/UserPhoneAlreadyExistedException.java | 2 +- .../bootx/platform/iam/handler/DataPermScopeHandlerImpl.java | 2 +- .../cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java | 2 +- .../cn/bootx/platform/iam/handler/PermCodeRouterCheck.java | 2 +- .../platform/iam/handler/SelectFieldPermHandlerImpl.java | 2 +- .../cn/bootx/platform/iam/handler/UserPathRouterCheck.java | 2 +- .../cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java | 2 +- .../java/cn/bootx/platform/iam/param/client/ClientParam.java | 2 +- .../cn/bootx/platform/iam/param/client/LoginTypeParam.java | 2 +- .../main/java/cn/bootx/platform/iam/param/dept/DeptParam.java | 2 +- .../cn/bootx/platform/iam/param/permission/PermMenuParam.java | 2 +- .../iam/param/permission/PermPathBatchEnableParam.java | 2 +- .../cn/bootx/platform/iam/param/permission/PermPathParam.java | 2 +- .../main/java/cn/bootx/platform/iam/param/role/RoleParam.java | 2 +- .../cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java | 2 +- .../cn/bootx/platform/iam/param/scope/DataScopeParam.java | 2 +- .../cn/bootx/platform/iam/param/scope/DataScopeUserParam.java | 2 +- .../cn/bootx/platform/iam/param/upms/RolePermissionParam.java | 2 +- .../platform/iam/param/upms/UserDataScopeBatchParam.java | 2 +- .../cn/bootx/platform/iam/param/upms/UserDataScopeParam.java | 2 +- .../cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java | 2 +- .../java/cn/bootx/platform/iam/param/upms/UserRoleParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserBaseInfoParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserBindThirdParam.java | 2 +- .../bootx/platform/iam/param/user/UserChangeEmailParam.java | 2 +- .../bootx/platform/iam/param/user/UserChangePhoneParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserDeptBatchParam.java | 2 +- .../java/cn/bootx/platform/iam/param/user/UserDeptParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserExpandInfoParam.java | 2 +- .../bootx/platform/iam/param/user/UserForgetEmailParam.java | 2 +- .../bootx/platform/iam/param/user/UserForgetPhoneParam.java | 2 +- .../java/cn/bootx/platform/iam/param/user/UserInfoParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserRegisterParam.java | 2 +- .../cn/bootx/platform/iam/param/user/UserThirdInfoParam.java | 2 +- .../main/java/cn/bootx/platform/notice/NoticeApplication.java | 2 +- .../src/main/java/cn/bootx/platform/notice/code/MailCode.java | 2 +- .../cn/bootx/platform/notice/code/MessageTemplateCode.java | 2 +- .../cn/bootx/platform/notice/code/NoticeCenterErrorCode.java | 2 +- .../java/cn/bootx/platform/notice/code/SiteMessageCode.java | 2 +- .../platform/notice/controller/MailConfigController.java | 2 +- .../platform/notice/controller/MessageTemplateController.java | 2 +- .../platform/notice/controller/SiteMessageController.java | 2 +- .../notice/core/dingtalk/entity/chat/DingChatNoticeParam.java | 2 +- .../notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java | 2 +- .../core/dingtalk/entity/corp/DingCorpNoticeReceive.java | 2 +- .../core/dingtalk/entity/corp/DingCorpNoticeUpdate.java | 2 +- .../notice/core/dingtalk/entity/msg/DingActionCardMsg.java | 2 +- .../platform/notice/core/dingtalk/entity/msg/DingFileMsg.java | 2 +- .../notice/core/dingtalk/entity/msg/DingImageMsg.java | 2 +- .../platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java | 2 +- .../notice/core/dingtalk/entity/msg/DingMarkDownMsg.java | 2 +- .../platform/notice/core/dingtalk/entity/msg/DingMsg.java | 2 +- .../platform/notice/core/dingtalk/entity/msg/DingOaMsg.java | 2 +- .../platform/notice/core/dingtalk/entity/msg/DingTextMsg.java | 2 +- .../notice/core/dingtalk/entity/msg/DingVoiceMsg.java | 2 +- .../core/dingtalk/service/DingRobotNoticeSenderImpl.java | 2 +- .../core/dingtalk/service/DingTalkNoticeSenderImpl.java | 2 +- .../bootx/platform/notice/core/mail/convert/MailConvert.java | 2 +- .../platform/notice/core/mail/dao/MailConfigManager.java | 2 +- .../bootx/platform/notice/core/mail/dao/MailConfigMapper.java | 2 +- .../cn/bootx/platform/notice/core/mail/entity/MailConfig.java | 2 +- .../notice/core/mail/service/EmailNoticeSenderImpl.java | 2 +- .../platform/notice/core/mail/service/MailConfigService.java | 2 +- .../platform/notice/core/site/convert/SiteMessageConvert.java | 2 +- .../platform/notice/core/site/dao/SiteMessageManager.java | 2 +- .../platform/notice/core/site/dao/SiteMessageMapper.java | 2 +- .../platform/notice/core/site/dao/SiteMessageUserManager.java | 2 +- .../platform/notice/core/site/dao/SiteMessageUserMapper.java | 2 +- .../platform/notice/core/site/domain/SiteMessageInfo.java | 2 +- .../notice/core/site/domain/SiteMessageInfoMapper.java | 2 +- .../bootx/platform/notice/core/site/entity/SiteMessage.java | 2 +- .../platform/notice/core/site/entity/SiteMessageUser.java | 2 +- .../platform/notice/core/site/service/SiteMessageService.java | 2 +- .../platform/notice/core/sms/dao/SmsChannelConfigMapper.java | 2 +- .../platform/notice/core/sms/entity/SmsChannelConfig.java | 2 +- .../notice/core/template/convert/MessageTemplateConvert.java | 2 +- .../notice/core/template/dao/MessageTemplateManager.java | 2 +- .../notice/core/template/dao/MessageTemplateMapper.java | 2 +- .../notice/core/template/service/MessageTemplateService.java | 2 +- .../notice/core/wechat/dao/WeChatNoticeConfigManager.java | 2 +- .../notice/core/wechat/dao/WeChatNoticeConfigMapper.java | 2 +- .../notice/core/wechat/entity/WeChatNoticeConfig.java | 2 +- .../platform/notice/core/wecom/entity/WeComNoticeParam.java | 2 +- .../platform/notice/core/wecom/entity/WeComNoticeReceive.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComFileMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComImageMsg.java | 2 +- .../notice/core/wecom/entity/msg/WeComMarkdownMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java | 2 +- .../bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComNewsMsg.java | 2 +- .../notice/core/wecom/entity/msg/WeComRobotReceive.java | 2 +- .../notice/core/wecom/entity/msg/WeComTextCardMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComTextMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComVideoMsg.java | 2 +- .../platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java | 2 +- .../notice/core/wecom/service/WeComNoticeSenderImpl.java | 2 +- .../notice/core/wecom/service/WeComRobotNoticeSenderImpl.java | 2 +- .../java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java | 2 +- .../java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java | 2 +- .../java/cn/bootx/platform/notice/dto/mail/MailFileParam.java | 2 +- .../cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java | 2 +- .../java/cn/bootx/platform/notice/dto/mail/SendMailParam.java | 2 +- .../platform/notice/dto/mail/ToUserRequiredMailParam.java | 2 +- .../cn/bootx/platform/notice/dto/site/SiteMessageDto.java | 2 +- .../platform/notice/dto/template/MessageTemplateDto.java | 2 +- .../platform/notice/dto/wechat/WeChatNoticeConfigDto.java | 2 +- .../notice/exception/CodeTemplateExistedException.java | 2 +- .../exception/DefaultMailConfigAlreadyExistedException.java | 2 +- .../exception/MailConfigCodeAlreadyExistedException.java | 2 +- .../notice/exception/MailTemplateNotExistException.java | 2 +- .../cn/bootx/platform/notice/param/mail/MailConfigParam.java | 2 +- .../bootx/platform/notice/param/mail/MailTemplateParam.java | 2 +- .../platform/notice/param/site/SendSiteMessageParam.java | 2 +- .../platform/notice/param/template/MessageTemplateParam.java | 2 +- .../bootx/platform/notice/service/DingRobotNoticeSender.java | 2 +- .../bootx/platform/notice/service/DingTalkNoticeSender.java | 2 +- .../cn/bootx/platform/notice/service/EmailNoticeSender.java | 2 +- .../cn/bootx/platform/notice/service/SmsNoticeSender.java | 2 +- .../cn/bootx/platform/notice/service/WeChatNoticeSender.java | 2 +- .../cn/bootx/platform/notice/service/WeComNoticeSender.java | 2 +- .../bootx/platform/notice/service/WeComRobotNoticeSender.java | 2 +- .../platform/visualization/VisualizationApplication.java | 2 +- .../java/cn/bootx/platform/visualization/code/GoVIewCode.java | 2 +- .../visualization/configuration/VisualizationProperties.java | 2 +- .../visualization/controller/GoViewAdminController.java | 2 +- .../platform/visualization/controller/GoViewController.java | 2 +- .../platform/visualization/core/convert/GoViewConvert.java | 2 +- .../platform/visualization/core/dao/ProjectInfoManager.java | 2 +- .../platform/visualization/core/dao/ProjectInfoMapper.java | 2 +- .../visualization/core/dao/ProjectInfoPublishManager.java | 2 +- .../visualization/core/dao/ProjectInfoPublishMapper.java | 2 +- .../bootx/platform/visualization/core/entity/ProjectInfo.java | 2 +- .../visualization/core/entity/ProjectInfoPublish.java | 2 +- .../visualization/core/service/ProjectInfoService.java | 2 +- .../cn/bootx/platform/visualization/dto/GoVIewPageResult.java | 2 +- .../java/cn/bootx/platform/visualization/dto/OssInfo.java | 2 +- .../cn/bootx/platform/visualization/dto/ProjectInfoDto.java | 2 +- .../bootx/platform/visualization/dto/ProjectInfoResult.java | 2 +- .../visualization/login/GoViewLoginAuthentication.java | 2 +- .../cn/bootx/platform/visualization/param/CreateParam.java | 2 +- .../bootx/platform/visualization/param/ProjectInfoParam.java | 2 +- .../bootx/platform/visualization/param/ProjectInfoSave.java | 2 +- .../cn/bootx/platform/visualization/param/PublishParam.java | 2 +- .../main/java/cn/bootx/platform/start/BootxApplication.java | 2 +- 870 files changed, 876 insertions(+), 876 deletions(-) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java index 802e8a50..e96becfe 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/BigField.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 大字段注解 * * @author xxm - * @date 2021/10/24 + * @since 2021/10/24 */ @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java index dca870e4..87cd1029 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/CountTime.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 获取程序执行时间注解 * * @author xxm - * @date 2020/12/22 + * @since 2020/12/22 */ @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java index 5f6a8cb5..e4f1eef2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/DataVersionLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 数据版本日志 * * @author xxm - * @date 2023/1/2 + * @since 2023/1/2 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java index 7b29b65b..7fbf1af7 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/EncryptionField.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 加密字段注解 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java index 088d33a0..d6ee7eea 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Idempotent.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 幂等性拦截注解 * * @author xxm - * @date 2021/1/2 + * @since 2021/1/2 */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java index 11d40fce..dfc14837 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/JobLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 定时任务日志 * * @author xxm - * @date 2022/7/12 + * @since 2022/7/12 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java index 27eb4a99..1e324c37 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/NestedPermission.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 嵌套权限控制注解,需要配合Permission注解一起使用,在Permission注解声明方法调用其他子方法时, 通过添加本数据来忽略子方法执行时的数据权限拦截 * * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java index e65caec7..41da7c5f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLog.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 操作日志注解(支持重复注解) * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java index fa3cd2ab..87320186 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/OperateLogs.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 操作日志注解组 * * @author xxm - * @date 2021/12/20 + * @since 2021/12/20 */ @Target({ ElementType.PARAMETER, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java index e3b0bd74..ac9d1027 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * 放在数据库实体类及字段上时，会在启用查询字段权限的时候，对用户没有权限码的字段不进行SQL查询 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java index a8aefb35..235c2e94 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Permission.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * * @see NestedPermission 通常在嵌套方法不启用数据权限时使用 * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java index dd6f0629..d79dfc3e 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/QueryParam.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 查询参数 生效顺序 QueryParams 查询参数字段 > Entity 数据库实体字段 > QueryParams 查询类 > Entity 数据库实体类 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Target({ ElementType.TYPE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java index d4ba56d6..390dc9ea 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvert.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 数据库表字段翻译注解 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java index b6b69b3c..64ebf42f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TableFieldConvertModel.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 字典转换标示注解, 标注此注解会对对应对象进行字典值转换处理 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java index c01a8706..74e88cc2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/Translate.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 翻译注解 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java index 1d032191..3e98d247 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/TranslationResult.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; * ResResult 使用, 其他场合使用 FieldTranslationService 进行手动处理 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Target({ ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java index 1ada0c4c..9d41a581 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/CommonCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.code; * 公共常量 * * @author xxm - * @date 2020/4/8 10:58 + * @since 2020/4/8 10:58 */ public interface CommonCode { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java index e685b265..98c964ac 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/code/ServletCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.code; * Servlet常量 * * @author xxm - * @date 2022/3/10 + * @since 2022/3/10 */ public interface ServletCode { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java index 4e6c649f..afad5241 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/entity/UserDetail.java @@ -13,7 +13,7 @@ import java.util.List; * 用户信息类 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java index ceee61b9..28adcf2f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DangerSqlException.java @@ -6,7 +6,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DANGER_SQL; * SQL相关异常 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ public class DangerSqlException extends BizException { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java index 472ccfb8..7d33c3bf 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/DataNotExistException.java @@ -6,7 +6,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_NOT_EXIST; * 数据不存在异常 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public class DataNotExistException extends BizException { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java index f696bd41..ec6af041 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/OptimisticLockException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.DATA_OUT_OF_DAT * 乐观锁异常 * * @author xxm - * @date 2020/4/15 14:11 + * @since 2020/4/15 14:11 */ public class OptimisticLockException extends SystemException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java index e4c9a242..ef2d9ab6 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/RepetitiveOperationException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.REPETITIVE_OPER * 重复操作异常 * * @author xxm - * @date 2021/1/2 + * @since 2021/1/2 */ public class RepetitiveOperationException extends SystemException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java index 7a6040da..ebd79796 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportOperateException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_OP * 不支持的操作异常 * * @author xxm - * @date 2022/7/27 + * @since 2022/7/27 */ public class UnSupportOperateException extends ErrorCodeRuntimeException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java index e9b60f4b..6bb18bd0 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/exception/UnSupportReadException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.UN_SUPPORTED_RE * 不支持的读取操作 * * @author xxm - * @date 2020/4/10 14:05 + * @since 2020/4/10 14:05 */ public class UnSupportReadException extends BizException implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java index 57c43ad5..910cd807 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/CollectorsFunction.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * stream流处理时进行Collectors时的函数 * * @author xxm - * @date 2023/3/12 + * @since 2023/3/12 */ public interface CollectorsFunction { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java index 096696e5..b4fe3ce2 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/EntityBaseFunction.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * entity基础方法 * * @author xxm - * @date 2020/11/18 + * @since 2020/11/18 */ public interface EntityBaseFunction { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java index f6f87bf4..b72ea2c9 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.function; * 参数获取服务(必须有实现类) * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ public interface ParamService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java index 2af97e33..293c2595 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java @@ -8,7 +8,7 @@ import java.util.List; * kv存储接口 (必须实现) * * @author xxm - * @date 2022/6/13 + * @since 2022/6/13 */ public interface SystemKeyValueService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java index a445f363..38448655 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/UserDetailService.java @@ -8,7 +8,7 @@ import java.util.Optional; * 获取用户 * * @author xxm - * @date 2022/8/28 + * @since 2022/8/28 */ public interface UserDetailService { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java index 1a967b94..d3d1422d 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ErrorResult.java @@ -8,7 +8,7 @@ import lombok.Setter; * 错误响应类,携带链路追踪标示 trackId * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java index a0041423..4cedead3 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/PageResult.java @@ -8,7 +8,7 @@ import java.util.List; * 分页包装类 * * @author xxm - * @date 2020/4/21 14:37 + * @since 2020/4/21 14:37 */ public class PageResult implements Serializable { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java index 67181137..07eb33b4 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/Res.java @@ -7,7 +7,7 @@ import static cn.bootx.platform.common.core.code.CommonCode.SUCCESS_CODE; * 返回工具类 * * @author xxm - * @date 2020/1/22 15:29 + * @since 2020/1/22 15:29 */ public class Res { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java index 234b3cd0..b935a920 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/ResResult.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 响应包装类 * * @author xxm - * @date 2020/1/22 15:26 + * @since 2020/1/22 15:26 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java index dfaa3728..e441422f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/BaseDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 基础Dto * * @author xxm - * @date 2020/6/1 16:12 + * @since 2020/6/1 16:12 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java index de37396d..e4b97238 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/KeyValue.java @@ -10,7 +10,7 @@ import java.io.Serializable; * kv键值对象 * * @author xxm - * @date 2021/5/18 + * @since 2021/5/18 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java index d620f858..36475359 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/dto/LabelValue.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * LabelValue * * @author xxm - * @date 2022/5/4 + * @since 2022/5/4 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java index 4a99f188..53744de4 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/rest/param/OrderParam.java @@ -8,7 +8,7 @@ import lombok.Setter; * 排序参数 * * @author xxm - * @date 2022/3/10 + * @since 2022/3/10 */ @Getter @Setter diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java index c3a49524..b8a3444b 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CertUtil.java @@ -13,7 +13,7 @@ import java.security.PublicKey; * 证书工具类 * * @author xxm - * @date 2022/2/24 + * @since 2022/2/24 */ @UtilityClass public class CertUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java index 3083c67f..4a31c524 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/CollUtil.java @@ -8,7 +8,7 @@ import java.util.Collection; * 集合工具类 * * @author xxm - * @date 2020/11/28 + * @since 2020/11/28 */ @UtilityClass public class CollUtil extends cn.hutool.core.collection.CollUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java index 2352e94b..312893f3 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/FileUtil.java @@ -11,7 +11,7 @@ import java.nio.file.Files; * 文件配置 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @UtilityClass public class FileUtil extends cn.hutool.core.io.FileUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java index f34eb982..141ba134 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/LocalDateTimeUtil.java @@ -11,7 +11,7 @@ import java.time.ZoneId; * java8 时间工具类 * * @author xxm - * @date 2020/11/10 + * @since 2020/11/10 */ @UtilityClass public class LocalDateTimeUtil extends cn.hutool.core.date.LocalDateTimeUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java index 3a39113e..c1e6a2f8 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ResultConvertUtil.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; * 结果转换工具类工具类 * * @author xxm - * @date 2020/8/27 + * @since 2020/8/27 */ @UtilityClass public class ResultConvertUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java index d93c06a8..c67e143f 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/TreeBuildUtil.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * 构建数据树工具类 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @UtilityClass public class TreeBuildUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java index bdff34ac..ae27003c 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/util/ValidationUtil.java @@ -13,7 +13,7 @@ import java.util.Set; * BeanValidation 工具类 * * @author xxm - * @date 2020/5/26 18:14 + * @since 2020/5/26 18:14 */ @UtilityClass public class ValidationUtil { diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java index 0c46e92c..4e55770e 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/validation/ValidationGroup.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.core.validation; * 校验分组 * * @author xxm - * @date 2021/5/7 + * @since 2021/5/7 */ public interface ValidationGroup { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java index 64fbbc76..fbf9e514 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/AuditLogAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie * 审计模块 * * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java index 4778e765..a719ab95 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/configuration/DataVersionConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * @author xxm - * @date 2023/1/2 + * @since 2023/1/2 */ @Configuration public class DataVersionConfiguration { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java index 7960ce4e..90979b3e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/DataVersionLogController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Tag(name = "数据版本日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java index 41455898..9c9e1892 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/LoginLogController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2021/9/7 + * @since 2021/9/7 */ @Tag(name = "登录日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java index c7af9edc..b34df2ce 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/controller/OperateLogController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 操作日志 * * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Tag(name = "操作日志") @RestController diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java index 7dc4f40d..62cccf4b 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/convert/LogConvert.java @@ -15,7 +15,7 @@ import org.mapstruct.factory.Mappers; * 日志转换 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LogConvert { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java index 4e3a33e8..f4fdc0a6 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbManager.java @@ -15,7 +15,7 @@ import java.util.Objects; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java index 1172d05f..dac4de33 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/DataVersionLogDbMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Mapper public interface DataVersionLogDbMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java index f482fa79..e6999a21 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java index 17325885..b90720aa 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/LoginLogDbMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LoginLogDbMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java index 3522ad31..3e9f5c03 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/dao/OperateLogDbManager.java @@ -17,7 +17,7 @@ import java.util.Objects; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java index 57387b66..6ea9b933 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/DataVersionLogDb.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java index 74628f4b..b79631b4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/LoginLogDb.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java index fa453e98..a1bb18ee 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/entity/OperateLogDb.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java index 683fdd27..4147d695 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/DataVersionLogDbService.java @@ -24,7 +24,7 @@ import java.util.Objects; * 数据版本日志数据库实现 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java index 86e2c8b1..7741d070 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/LoginLogDbService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * 登陆日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java index 7977129e..8d1ac8bb 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/db/service/OperateLogDbService.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java index 192c7451..28bb49c8 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/convert/LogConvert.java @@ -15,7 +15,7 @@ import org.mapstruct.factory.Mappers; * 日志转换 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Mapper public interface LogConvert { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java index 06ee8466..65af59e4 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/DataVersionLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public interface DataVersionLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java index b94ef870..5fef2327 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/LoginLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface LoginLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java index 6fb08c59..14b8d1aa 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/dao/OperateLogMongoRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.mongodb.repository.MongoRepository; * mongo持久化方式 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface OperateLogMongoRepository extends MongoRepository { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java index b9da4066..15822d97 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/DataVersionLogMongo.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @FieldNameConstants diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java index 2d461d38..804d5d54 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/LoginLogMongo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java index ecd3d716..157cb454 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/entity/OperateLogMongo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java index 943b58f7..570014f1 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/DataVersionLogMongoService.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java index cfd59eab..c1d092f5 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/LoginLogMongoService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * MongoDB存储实现 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java index db252962..63b65f5c 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/core/mongo/service/OperateLogMongoService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * MongoDB存储实现 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java index cb098453..076297ba 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/DataVersionLogDto.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java index c5b24ebb..6c8a435f 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/LoginLogDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java index 8f23f82f..319777b5 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/dto/OperateLogDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java index c908c1fc..ef915f04 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/DataVersionRecordHandler.java @@ -17,7 +17,7 @@ import java.util.*; * 数据变动记录插件 * * @author xxm - * @date 2023/1/8 + * @since 2023/1/8 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java index eafcc1b8..7164e820 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/handler/OperateLogAspectHandler.java @@ -35,7 +35,7 @@ import java.util.Optional; * 操作日志切面处理 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java index 316ae289..8cd05c6c 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpRegion.java @@ -10,7 +10,7 @@ import java.util.List; /** * IP对应地址区域信息 * @author xxm - * @date 2023/4/13 + * @since 2023/4/13 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java index 66e0d1a0..e0543799 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java @@ -17,7 +17,7 @@ import java.util.regex.Matcher; /** * * @author xxm - * @date 2023/4/13 + * @since 2023/4/13 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java index 5ebbaabb..819ffe75 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/DataVersionLogParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java index e2ff6aff..944b73ba 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/LoginLogParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 登录日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java index 7fae648b..b8f0e35e 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/param/OperateLogParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java index 7eda363b..7275d28a 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/properties/AuditLogProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 审计日志配置 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java index e9eba4f2..c59b7add 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/DataVersionLogService.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.Async; * 数据版本日志 * * @author xxm - * @date 2022/1/10 + * @since 2022/1/10 */ public interface DataVersionLogService { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java index 3a24746d..0ac167da 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/LoginLogService.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Async; * 登陆日志 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ public interface LoginLogService { diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java index 9392b2a5..e1844dad 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/service/OperateLogService.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.Async; * 操作日志 * * @author xxm - * @date 2021/8/12 + * @since 2021/8/12 */ public interface OperateLogService { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java index 6759a635..daa42261 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/AuthAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 认证相关 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java index b49e61df..72b49f0b 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/AbstractAuthentication.java @@ -14,7 +14,7 @@ import java.util.Objects; * 抽象认证器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java index 982e2f85..55e25f91 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthClientService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.entity.AuthClient; * 获取认证终端 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public interface GetAuthClientService { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java index 47d6eb88..5105fc9a 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/GetAuthLoginTypeService.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.entity.AuthLoginType; * 获取认证登录方式对象服务 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ public interface GetAuthLoginTypeService { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java index 6d72ba28..08c322b4 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/OpenIdAuthentication.java @@ -8,7 +8,7 @@ import me.zhyd.oauth.model.AuthUser; * OpenId登录认证器 (微信/钉钉/飞书/QQ/企微等) * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface OpenIdAuthentication extends AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java index a64c2647..2f488a1b 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/RouterCheck.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.authentication; * 路由拦截检查 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ public interface RouterCheck { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java index 4dcd6116..c4925094 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/authentication/UsernamePasswordAuthentication.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; * 用户密码认证方式 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public interface UsernamePasswordAuthentication extends AbstractAuthentication { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java index ef502cec..8e918a21 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheFilter.java @@ -16,7 +16,7 @@ import java.io.IOException; * session缓存,用来减少一个请求中多次获取用户信息导致的多次访问redis * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Order(value = Integer.MIN_VALUE + 1) @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java index 4e310327..273fa855 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/cache/SessionCacheLocal.java @@ -7,7 +7,7 @@ import com.alibaba.ttl.TransmittableThreadLocal; * 会话缓存线程存储 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ public final class SessionCacheLocal { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java index db3421d0..2fa7aec9 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.code; * 认证录方式 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ public interface AuthLoginTypeCode { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java index e85b6c6f..85a0bed9 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/AuthProperties.java @@ -12,7 +12,7 @@ import java.util.List; * 认证配置参数 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java index b1ea5c40..d3ca01cb 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/configuration/SaTokenConfigure.java @@ -15,7 +15,7 @@ import java.util.Collections; * sa-token * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @EnableConfigurationProperties(AuthProperties.class) @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java index 4dabbd3c..09f63d98 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenEndpoint.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse; * 基础登录退出操作 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Tag(name = "认证相关") @RestController diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java index d11426f5..df9b3f27 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/endpoint/TokenService.java @@ -32,7 +32,7 @@ import java.util.List; * 认证相关服务 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java index ccfc9857..51e15d37 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthClient.java @@ -9,7 +9,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java index c982ab18..988a5cec 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthInfoResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 认证返回结果 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java index 2f4ac9c3..415dd6af 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/AuthLoginType.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java index ad61b904..67e0dd91 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/LoginAuthContext.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull; * 认证上下文 * * @author xxm - * @date 2022/4/23 + * @since 2022/4/23 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java index 2a0bd7f7..5f64f4cc 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/entity/ThirdAuthCode.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 三方登录认证码 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java index 5dc68d3c..d464478b 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotEnableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 应用被停用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public class ApplicationNotEnableException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java index fa2f8cf0..3d56f966 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ApplicationNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 应用不存在 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ public class ApplicationNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java index 6042c167..2df7c0a6 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotEnableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 终端方式被停用 * * @author xxm - * @date 2021/9/7 + * @since 2021/9/7 */ public class ClientNotEnableException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java index 95dc627b..bef5144f 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/ClientNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 终端不存在 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ public class ClientNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java index cf1dd9de..2f187bb4 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LoginFailureException.java @@ -7,7 +7,7 @@ import lombok.Getter; * 登录错误异常 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Getter public class LoginFailureException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java index af90a7fe..53f3ce7d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/LonginTypeNotFoundException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 登录方式不存在 * * @author xxm - * @date 2022/11/6 + * @since 2022/11/6 */ public class LonginTypeNotFoundException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java index 11cb667e..2e6d3e1e 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/NotLoginException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.common.core.code.CommonErrorCode.AUTHENTICATION_ * 未登录异常 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public class NotLoginException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java index 62461c3b..fb340cc7 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/RouterCheckException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 路径检查异常 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ public class RouterCheckException extends BizException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java index bea39bf0..10accb68 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/exception/UserNotFoundException.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.auth.exception; * 用户未找到异常 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ public class UserNotFoundException extends LoginFailureException { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java index 018eea25..6fbc2084 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse; * 登录失败处理器 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ public interface LoginFailureHandler { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java index 13134dc1..c8a0d5a9 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse; * 登录成功处理器 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ public interface LoginSuccessHandler { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java index b555dbe7..2e5c5c28 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/OpenIdAuthenticationHandler.java @@ -15,7 +15,7 @@ import java.util.List; * OpenID登录处理器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java index e0915543..ea6e46f1 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaExceptionHandler.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; * 过滤SaTokenException,需要运行在 RestExceptionHandler 之前 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Order(Ordered.LOWEST_PRECEDENCE - 1) @Slf4j diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java index 1be1e57d..0f9e8d7d 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/SaRouteHandler.java @@ -17,7 +17,7 @@ import java.util.List; * 鉴权路由配置类 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java index 30c386a3..f4498114 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAdminUserRouterCheck.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 超级管理员跳过各种限制 * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Component @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java index a3ee5576..1b83eb09 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/impl/IgnoreAnnotationRouterCheck.java @@ -12,7 +12,7 @@ import java.util.Objects; * 注解方式过滤 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Component public class IgnoreAnnotationRouterCheck implements RouterCheck { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java index a0602895..252f2b69 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserDto.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java index d8bd5927..81e0dd5c 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/online/OnlineUserService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 在线用户 * * @author xxm - * @date 2021/9/8 + * @since 2021/9/8 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java index b01f03b0..096bca00 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/redis/SaTokenRedisProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * sa-token Redis 插件配置 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @ConfigurationProperties(prefix = "sa-token.plugins.redis") public class SaTokenRedisProperties { diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java index 27c36a05..e498e359 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/PasswordEncoder.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * 密码编码器 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java index 44475eed..e7867155 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/util/SecurityUtil.java @@ -17,7 +17,7 @@ import java.util.Optional; * 安全工具类 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @UtilityClass public class SecurityUtil { diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java index 97bb0a36..9c1fb3e3 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/CodeGenAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * 代码生成 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java index 71e13345..de604375 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenColumnTypeEnum.java @@ -11,7 +11,7 @@ import java.util.Objects; * 数据库字段类型与java类型映射 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java index e7fc5172..bf50054f 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java @@ -11,7 +11,7 @@ import java.util.Objects; * 代码生成模板枚举 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java index 007db3f7..a463ea38 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/CodeGeneratorController.java @@ -20,7 +20,7 @@ import java.util.List; * 代码生成 * * @author xxm - * @date 2022/2/17 + * @since 2022/2/17 */ @Tag(name = "代码生成") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java index 6efe27c9..dad28571 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/controller/DatabaseTableController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Tag(name = "数据库表信息") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java index 1e25a34f..9cbdd36d 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dao/DatabaseTableMapper.java @@ -16,7 +16,7 @@ import java.util.Optional; * 表信息查询 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Mapper public interface DatabaseTableMapper { diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java index 9e5a955b..65fe4a96 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/domain/CodeGenData.java @@ -11,7 +11,7 @@ import java.util.List; * 代码生成所需的参数数据 * * @author xxm - * @date 2022/8/1 + * @since 2022/8/1 */ @Data @Accessors(chain = true) @@ -72,7 +72,7 @@ public class CodeGenData { * 行信息 * * @author xxm - * @date 2022/8/1 + * @since 2022/8/1 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java index 1ba3d3b6..3c7fdc88 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/CodeGenPreview.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码预览 * * @author xxm - * @date 2022/2/18 + * @since 2022/2/18 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java index f67d14bd..629e8015 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/dto/TableGenParamDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成相关参数信息 * * @author xxm - * @date 2022/8/2 + * @since 2022/8/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java index 8249c3bb..fc4a2f5e 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/CodeGenConfig.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成配置 * * @author xxm - * @date 2022/6/13 + * @since 2022/6/13 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java index 6ca69190..716210b9 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseColumn.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 数据库行信息 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java index a12b2e48..86ccf142 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/entity/DatabaseTable.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 表信息 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java index 0111ce0c..aa3ac0c4 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/param/CodeGenParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 代码生成参数 * * @author xxm - * @date 2022/2/18 + * @since 2022/2/18 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java index dfb9e3c8..c7771367 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java @@ -42,7 +42,7 @@ import java.util.zip.ZipOutputStream; * 代码生成模板 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java index 562ae2b1..7ab50f03 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/DatabaseTableService.java @@ -26,7 +26,7 @@ import java.util.List; * 数据库信息服务类型 * * @author xxm - * @date 2022/1/27 + * @since 2022/1/27 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java index d8e83e90..a394a682 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/util/CodeGenUtil.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * 代码生成工具类 * * @author xxm - * @date 2022/8/2 + * @since 2022/8/2 */ @UtilityClass public class CodeGenUtil { diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm index e9d8e534..fad161c6 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm @@ -17,7 +17,7 @@ import java.util.List; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Tag(name ="${comments}") @RestController diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm index 87e2aa77..1ad55ca1 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/convert.java.vm @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Mapper public interface ${entityUpName}Convert { @@ -19,4 +19,4 @@ public interface ${entityUpName}Convert { ${entityUpName}Dto convert(${entityUpName} in); -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm index 95c4a8f5..b128d597 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/dto.java.vm @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm index dccc5fb7..272b65c4 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/entity.java.vm @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} -* @date ${datetime} +* @since ${datetime} */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm index bc113790..321d8e06 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/manager.java.vm @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm index ff2a74d6..908e15ec 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/mapper.java.vm @@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Mapper; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Mapper public interface ${entityUpName}Mapper extends BaseMapper<${entityUpName}> { -} \ No newline at end of file +} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm index 3317c54a..ddae2982 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Data @Schema(title = "${comments}") diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm index dca78757..23d54eb0 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm @@ -20,7 +20,7 @@ import java.util.List; /** * ${comments} * @author ${author} - * @date ${datetime} + * @since ${datetime} */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java index cf2b8e39..2758dab6 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/DataPermAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 数据权限 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java index eeb8257d..3963f835 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/code/DataScopeEnum.java @@ -10,7 +10,7 @@ import java.util.Arrays; * 数据范围权限类型 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Getter @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java index 5deb7019..530bb97e 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DataPermProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 数据权限配置 * * @author xxm - * @date 2021/12/3 + * @since 2021/12/3 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java index a820205c..c324b05c 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/configuration/DatePermConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * 数据权限配置 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java index b4da845f..486f3065 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/DecryptInterceptor.java @@ -26,7 +26,7 @@ import java.util.Objects; * 数据字段解密插件 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Slf4j @Intercepts(@Signature(type = ResultSetHandler.class, method = "handleResultSets", args = { Statement.class })) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java index 1045250b..2dfb9c39 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/dbencrypt/EncryptInterceptor.java @@ -24,7 +24,7 @@ import java.util.Objects; * 数据字段解密插件 * * @author xxm - * @date 2021/11/23 + * @since 2021/11/23 */ @Slf4j @Intercepts(@Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class })) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java index bbe67637..74abcb99 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/exception/NotLoginPermException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 未登录无法进行数据鉴权异常 * * @author xxm - * @date 2022/5/5 + * @since 2022/5/5 */ public class NotLoginPermException extends BizException { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java index 485f4af8..cee97214 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/handler/DataPermAspectHandler.java @@ -18,7 +18,7 @@ import java.util.Objects; * 忽略权限控制切面处理类 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java index 992d9436..b9e42417 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/local/DataPermContextHolder.java @@ -11,7 +11,7 @@ import java.util.Optional; * 忽略鉴权数据上下文 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public class DataPermContextHolder { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java index 6c6485e8..a0867cd8 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScope.java @@ -10,7 +10,7 @@ import java.util.Set; * 数据权限范围参数 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java index ccb83e37..8e9dac81 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataPermScopeHandler.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.data.perm.scope; * 数据范围权限业务实现接口 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ public interface DataPermScopeHandler { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java index 690ee265..14c4b371 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/scope/DataScopeInterceptor.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * 数据权限处理器 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java index 01cced0e..c8ba8f06 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermHandler.java @@ -8,7 +8,7 @@ import java.util.List; * 数据字段权限业务实现接口 * * @author xxm - * @date 2023/1/21 + * @since 2023/1/21 */ public interface SelectFieldPermHandler { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java index 181f64ec..fcf43c08 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/select/SelectFieldPermInterceptor.java @@ -30,7 +30,7 @@ import java.util.Objects; * 查询字段权限处理器 * * @author xxm - * @date 2022/12/29 + * @since 2022/12/29 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java index 9a107931..863133be 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfo.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; * 敏感信息过滤 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Retention(RetentionPolicy.RUNTIME) @JacksonAnnotationsInside @@ -36,7 +36,7 @@ public @interface SensitiveInfo { * 敏感信息 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ enum SensitiveType { diff --git a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java index 415d262c..9e8f9d40 100644 --- a/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java +++ b/bootx-common-starters/common-starter-data-perm/src/main/java/cn/bootx/platform/starter/data/perm/sensitive/SensitiveInfoSerialize.java @@ -19,7 +19,7 @@ import java.util.Objects; * 敏感信息脱敏序列化 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @AllArgsConstructor @NoArgsConstructor diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java index 943743a5..48cdf45a 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/DingTalkAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 钉钉对接 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java index bfafaa41..85f12e81 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.dingtalk.code; * 钉钉消息类型 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ public interface DingTalkCode { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java index 2d850ca5..45e94266 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/code/DingTalkNoticeCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.dingtalk.code; * 钉钉通知消息常量 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ public interface DingTalkNoticeCode { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java index 27f67f08..ee8f4aff 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/configuration/DingTalkProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 钉钉应用配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java index 2ff96f12..07d8806b 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/controller/DingRobotConfigController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/25 + * @since 2021/9/25 */ @Tag(name = "钉钉机器人配置") @RestController diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java index 00276c24..ceb76aad 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/DingTalkResult.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 钉钉响应结果 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java index 435932ce..c9cc5698 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/result/MediaResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 钉钉媒体上传返回类 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java index f5cf1e1a..c5d658d5 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/base/service/DingAccessService.java @@ -26,7 +26,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉访问凭证 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java index f698aeab..1ba98a15 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Manager.java @@ -12,7 +12,7 @@ import java.util.Optional; * 钉钉 * * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java index a05919de..6d9ae7c6 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/dao/DingMediaMd5Mapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Mapper public interface DingMediaMd5Mapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java index 6d643857..6b9800f4 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/entity/DingMediaMd5.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉媒体文件MD5值关联关系 * * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java index 95f2ec68..cd4c27d1 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaMd5Service.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java index 7d253956..0bd7b1dd 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/media/service/DingMediaService.java @@ -29,7 +29,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉媒体文件管理 * * @author xxm - * @date 2022/7/25 + * @since 2022/7/25 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java index de126c27..6494bc73 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/ChatNoticeResult.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java index 7f6661a8..89a42eeb 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/result/CorpNoticeResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 钉钉消息响应 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java index a5d431c2..34d689ee 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/notice/service/DingNoticeService.java @@ -21,7 +21,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉通知发送服务 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java index e6dac6d6..a6b586b6 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/convert/DingRobotConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 钉钉相关类转换 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface DingRobotConvert { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java index 454392aa..be0f01b2 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 钉钉机器人 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java index 7144aa0c..f1514179 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/dao/DingRobotConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 钉钉机器人配置 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface DingRobotConfigMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java index 7880a76b..2532efee 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/entity/DingRobotConfig.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 钉钉机器人配置 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java index 75a645c5..72d4781e 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotConfigService.java @@ -23,7 +23,7 @@ import java.util.List; * 钉钉机器人消息发送 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java index 920d3884..3cf12784 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/robot/service/DingRobotSendService.java @@ -24,7 +24,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.SUCCESS_CODE; * 钉钉机器人消息发送 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java index f3190ea2..82bb8f86 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/entity/UserIdResult.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/21 + * @since 2022/7/21 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java index 72e5cd83..83a40902 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/core/user/service/DingUserService.java @@ -22,7 +22,7 @@ import static cn.bootx.platform.starter.dingtalk.code.DingTalkCode.*; * 钉钉用户信息 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java index 1741c4cc..6d8c0e3a 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/ChatNotice.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 钉钉发送企业群消息参数 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java index 1e19e88d..7023a4d4 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/CorpNotice.java @@ -15,7 +15,7 @@ import java.util.Map; * 钉钉发送工作通知参数 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java index 9c24d194..805cbe72 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/RecallCorpNotice.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉撤回工作通知 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java index 48038f10..d6e03630 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/UpdateCorpNotice.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 钉钉 更新工作通知状态栏 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java index b40d8666..20ee7b85 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ActionCardMsg.java @@ -12,7 +12,7 @@ import java.util.List; * 钉钉卡片消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java index 5a4cc500..3aef3982 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/At.java @@ -13,7 +13,7 @@ import java.util.List; * 钉钉At * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java index c2fa7336..28012efd 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/DingMedia.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 钉钉图片 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java index fbbebed1..d948b44d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/FileMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 钉钉图片通知 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java index d8df2966..a1fa6cb8 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/ImageMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 钉钉图片通知 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java index 51e311c2..20b1ab0c 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/LinkMsg.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 钉钉链接消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java index 7e6f5b28..40548c1d 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/MarkdownMsg.java @@ -14,7 +14,7 @@ import java.util.List; * 钉钉markdown消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java index 6deaccfa..656371c4 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/Msg.java @@ -14,7 +14,7 @@ import java.io.Serializable; * 钉钉消息 * * @author xxm - * @date 2020/11/30 + * @since 2020/11/30 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java index 78cea3c2..fbaab913 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/OaMsg.java @@ -14,7 +14,7 @@ import java.util.List; * 钉钉OA消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java index 0f79ceb8..72e71d04 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/TextMsg.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java index b1296a2a..d4b95c51 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/notice/msg/VoiceMsg.java @@ -15,7 +15,7 @@ import java.io.Serializable; * 钉钉语音消息 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java index 10039483..620604d8 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/param/robot/DingRobotConfigParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java index b5f9fc7f..ba4494ed 100644 --- a/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java +++ b/bootx-common-starters/common-starter-dingtalk/src/main/java/cn/bootx/platform/starter/dingtalk/util/DingTalkUtil.java @@ -15,7 +15,7 @@ import java.security.NoSuchAlgorithmException; * 钉钉工具类 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @UtilityClass diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java index 13db208d..fea14281 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/FileAutoConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie * 文件管理 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java index c0588ede..f302b278 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.file.code; * 文件上传类型 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ public enum FileUploadTypeEnum { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java index 198f98c6..d8337c51 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate; * 文件上传配置 * * @author xxm - * @date 2022/2/15 + * @since 2022/2/15 */ @Configuration @ConditionalOnClass(name="org.springframework.data.mongodb.gridfs.GridFsTemplate") diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index bd2474a8..e031fc6a 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -11,7 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 文件上传配置 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index a1bf2f11..076fcf9b 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -21,7 +21,7 @@ import java.io.IOException; * 文件上传 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @IgnoreAuth @Tag(name = "文件上传") diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java index 0aa5e04c..19a6e719 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/convert/FileConvert.java @@ -7,7 +7,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Mapper public interface FileConvert { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java index 47919e0d..7232ab4a 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileManager.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java index a44cc9e3..8e3ed31e 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/UpdateFileMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Mapper public interface UpdateFileMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java index bf341876..23fba3e3 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpdateFileDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 上传文件信息 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java index 2a45fdef..10f8a7ca 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UpdateFileInfo.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; * 上传文件信息 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java index e42bacbf..442a4d54 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/UploadFileContext.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 上传文件上下文 * * @author xxm - * @date 2022/1/20 + * @since 2022/1/20 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 57d2cc55..20344cc4 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -35,7 +35,7 @@ import java.util.List; * 文件上传管理类 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java index 386d018c..e3e818df 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/UploadService.java @@ -12,7 +12,7 @@ import java.io.InputStream; * 文件上传接口 * * @author xxm - * @date 2022/1/14 + * @since 2022/1/14 */ public interface UploadService { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java index 6f5ec992..4cdbf72b 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/LocalUploadService.java @@ -29,7 +29,7 @@ import java.util.Optional; * 上传文件本地存储 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java index 6d9a6109..29825db5 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java @@ -23,7 +23,7 @@ import java.util.Objects; * minio方式存储文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java index 748a31ab..f2ccbc86 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MongoUploadService.java @@ -29,7 +29,7 @@ import java.util.Optional; * mongo方式存储文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java index e076d2f7..7d2c752e 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/OssUploadService.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; * 阿里云OSS上传文件 * * @author xxm - * @date 2022/1/12 + * @since 2022/1/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java index da3251d9..23318751 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/MonitorAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * 系统信息监控模块 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @ComponentScan @AutoConfiguration diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java index 3af32b7c..947c4305 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/controller/SystemMonitorController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Tag(name = "系统信息监控") @RestController diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java index 88ccd7e1..def02d0c 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/MongoMonitorResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * MongoDB监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java index ae79f435..43ae5b78 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/RedisMonitorResult.java @@ -11,7 +11,7 @@ import java.util.Properties; * Redis监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Data @Schema(title = "Redis监控信息") diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java index 3b7084f3..838e74e4 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/entity/SystemMonitorResult.java @@ -34,7 +34,7 @@ import java.util.List; * 系统属性结果 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Data @Schema(title = "系统属性结果") diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java index 0644be07..e565e653 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/RedisMonitorService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * Redis监控信息 * * @author xxm - * @date 2022/6/12 + * @since 2022/6/12 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java index 080b51a8..81af79d1 100644 --- a/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java +++ b/bootx-common-starters/common-starter-monitor/src/main/java/cn/bootx/platform/starter/monitor/service/SystemMonitorService.java @@ -25,7 +25,7 @@ import java.util.concurrent.ThreadPoolExecutor; * 系统信息 * * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/README.md b/bootx-common-starters/common-starter-quartz/README.md index b48e6b35..08999dd4 100644 --- a/bootx-common-starters/common-starter-quartz/README.md +++ b/bootx-common-starters/common-starter-quartz/README.md @@ -13,7 +13,7 @@ /** * 测试定时任务 * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @Slf4j public class TestTask implements Job { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java index e6bd9b68..555d5059 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/QuartzJobAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java index 2035ee40..5b370187 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/code/QuartzJobCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.quartz.code; * 定时任务状态 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ public interface QuartzJobCode { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java index 9f709451..eefaed22 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/configuration/QuartzProperties.java @@ -18,7 +18,7 @@ import static org.quartz.impl.jdbcjobstore.Constants.DEFAULT_TABLE_PREFIX; * 支持配置文件自动提示 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java index 1f5309b5..e2825564 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Tag(name = "定时任务") @RestController diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java index b8f5e39f..ae39fc9b 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/controller/QuartzJobLogController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/5/2 + * @since 2022/5/2 */ @Tag(name = "定时任务执行日志") @RestController diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java index 3528a182..95d6c522 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/convert/QuartzJobConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; * 定时任务转换 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Mapper public interface QuartzJobConvert { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java index 81f3ab49..7383ff83 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogManager.java @@ -15,7 +15,7 @@ import java.util.Objects; /** * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java index 54efefde..a166cf3c 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobLogMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 定时任务日志 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Mapper public interface QuartzJobLogMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java index 0fec0988..eb8cf1b1 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobManager.java @@ -17,7 +17,7 @@ import java.util.List; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java index 7c244ee2..d8af2ada 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/dao/QuartzJobMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Mapper public interface QuartzJobMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java index fb53f552..9213e3b2 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJob.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java index e5c2ac32..35727994 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/entity/QuartzJobLog.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * 任务执行日志 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java index 7a51e518..78d35dad 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobLogService.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; * 定时任务日志 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java index cd98b475..35b1c1e9 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/core/service/QuartzJobService.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java index 9a6bcd97..40620970 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java index 9bb53589..5866a833 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/dto/QuartzJobLogDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 任务执行日志 * * @author xxm - * @date 2021/8/20 + * @since 2021/8/20 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java index 2a1ec629..fd894304 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/JobLogAspectHandler.java @@ -19,7 +19,7 @@ import java.util.Optional; * 定时任务日志切面 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ @Slf4j @Aspect diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java index c3856269..18fb3524 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/handler/QuartzJobScheduler.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; * 定时任务调度器 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java index 2fcc0709..3573938e 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobLogQuery.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/5/2 + * @since 2022/5/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java index 18c30301..6ffb4d28 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/param/QuartzJobParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 定时任务 * * @author xxm - * @date 2021/11/2 + * @since 2021/11/2 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java index 8c623fd4..34d27555 100644 --- a/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java +++ b/bootx-common-starters/common-starter-quartz/src/main/java/cn/bootx/platform/starter/quartz/task/TestTask.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; * 测试定时任务 * * @author xxm - * @date 2021/11/8 + * @since 2021/11/8 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java index 25fcc2a8..42089c6f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/WeChatAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 微信操作封装 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java index b1a8f03c..edf7660e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/code/WeChatCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wechat.code; * 微信编码 * * @author xxm - * @date 2022/8/5 + * @since 2022/8/5 */ public interface WeChatCode { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java index 1f830932..991a8f63 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration; * 微信配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java index 70a6e039..9799789b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatMessageRouterConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; * 微信信息路由配置 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Configuration diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java index 47b6fa53..7d1c4353 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 微信公众平台配置 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java index 765380ae..29749eaa 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatArticleController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/11 + * @since 2022/8/11 */ @Tag(name = "微信文章管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java index 163b523d..bfd82f4e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMediaController.java @@ -16,7 +16,7 @@ import static me.chanjar.weixin.mp.bean.material.WxMpMaterialNewsBatchGetResult. /** * @author xxm - * @date 2022/8/9 + * @since 2022/8/9 */ @Tag(name = "微信素材管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java index 9fd4bf9c..1c556776 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatMenuController.java @@ -18,7 +18,7 @@ import java.util.List; * 微信菜单管理 * * @author xxm - * @date 2022/8/6 + * @since 2022/8/6 */ @Tag(name = "微信菜单管理") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java index 644d6ea3..5028b4a0 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatPortalController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*; * 微信工作台接入入口 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @IgnoreAuth @Slf4j diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java index c9a29a2f..de3fda8b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatQrLoginController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 微信 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @IgnoreAuth @Tag(name = "微信扫码登录") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java index 038ec7b9..d618de59 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/controller/WeChatTemplateController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Tag(name = "微信模板消息") @RestController diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java index 77584a36..ade2a2b1 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/article/service/WeChatArticleService.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2022/8/11 + * @since 2022/8/11 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java index 4c5602e5..19af0f27 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/login/service/WeChatQrLoginService.java @@ -21,7 +21,7 @@ import static cn.bootx.platform.starter.wechat.code.WeChatCode.*; * 扫码事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java index 14c55c64..bfbb2095 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/media/service/WeChatMediaService.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * 素材管理 * * @author xxm - * @date 2022/8/9 + * @since 2022/8/9 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java index 2390c680..0b27d719 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/convert/WeChatMenuConvert.java @@ -12,7 +12,7 @@ import org.mapstruct.factory.Mappers; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Mapper public interface WeChatMenuConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java index 7f5244cc..d60b693f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java index a9138a44..6934ab0e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/dao/WeChatMenuMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Mapper public interface WeChatMenuMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java index 2d30fcfa..aeb482c9 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/domin/WeChatMenuInfo.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 微信自定义菜单 * * @author xxm - * @date 2022/8/8 + * @since 2022/8/8 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java index bfd54964..b983003c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/entity/WeChatMenu.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java index 16616b13..b1b5ace7 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/menu/service/WeChatMenuService.java @@ -29,7 +29,7 @@ import java.util.List; * 微信菜单 * * @author xxm - * @date 2022/8/6 + * @since 2022/8/6 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java index 4f65a68e..1b2ab3a1 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/convert/WeChatTemplateConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Mapper public interface WeChatTemplateConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java index 57f9bf65..888a9b30 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateManager.java @@ -16,7 +16,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Slf4j @Repository diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java index 15e67848..6cafda22 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/dao/WeChatTemplateMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Mapper public interface WeChatTemplateMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java index e174692b..54b835f8 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/entity/WeChatTemplate.java @@ -18,7 +18,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplate; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @FieldNameConstants @EqualsAndHashCode(callSuper = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java index 985dfc53..b91c7507 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WeChatTemplateService.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; * 微信消息模板 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java index f8e51a96..83eae983 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/notice/service/WechatNoticeService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 微信消息通知功能 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java index c4250101..6b8d7c23 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/portal/service/WeChatPortalService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 微信门户处理 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java index c6754d64..125f4686 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/convert/WechatFansConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Mapper public interface WechatFansConvert { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java index 7c2d60f7..e526a91b 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java index 963a475c..fcea7f9e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/dao/WechatFansMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Mapper public interface WechatFansMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java index d5d4bc38..ce1a61ea 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/entity/WechatFans.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 微信粉丝 * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java index 9f6fa28d..7da1a592 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/core/user/service/WeChatUserService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 微信用户相关接口 (获取不到详细信息了) * * @author xxm - * @date 2022/7/15 + * @since 2022/7/15 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java index 0fda6f7c..c7b145a7 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/article/WeChatArticleDto.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 微信文章 * * @author xxm - * @date 2022/8/12 + * @since 2022/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java index 7e999011..adab6d5f 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/login/WeChatLoginQrCode.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Data @AllArgsConstructor diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java index af0a1b02..850a3028 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/media/WeChatMediaDto.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/8/12 + * @since 2022/8/12 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java index 5955b832..e9a93a59 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/menu/WeChatMenuDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java index 01d0a7f4..c2a42b8d 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/notice/WeChatTemplateDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java index 836b17ce..a0024f9e 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/dto/user/WechatFansDto.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java index d5a08783..b055a405 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/event/WeChatQrScanEvent.java @@ -7,7 +7,7 @@ import org.springframework.context.ApplicationEvent; * 微信扫码关注事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Getter public class WeChatQrScanEvent extends ApplicationEvent { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java index 1d5c974a..c49f32a5 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMpMessageHandler.java @@ -8,7 +8,7 @@ import me.chanjar.weixin.mp.constant.WxMpEventConstants; * 处理微信推送消息的处理器接口 (进行微封装) * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeChatMpMessageHandler extends WxMpMessageHandler { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java index 1717d7da..e2aa40b4 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatMsgHandler.java @@ -16,7 +16,7 @@ import java.util.Map; * 微信接受文本消息处理 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java index d4fe53ac..e7df4b35 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatQrScanHandler.java @@ -21,7 +21,7 @@ import java.util.Objects; * 微信扫码事件 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java index 758aa01e..92018552 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatSubscribeHandler.java @@ -20,7 +20,7 @@ import java.util.Objects; * 新增关注订阅消息 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java index fbb499dd..e1cd0b82 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WeChatUnSubscribeHandler.java @@ -15,7 +15,7 @@ import java.util.Map; * 用户取消关注订阅消息 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java index d3dff71c..d3ebe7a1 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/WechatMenuHandler.java @@ -15,7 +15,7 @@ import java.util.Map; * 菜单点击事件 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java index 16e48911..5e9b012a 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrLoginHandler.java @@ -20,7 +20,7 @@ import static cn.bootx.platform.starter.wechat.code.WeChatCode.QRSCENE_LOGIN; * 微信扫码登录 * * @author xxm - * @date 2023/3/21 + * @since 2023/3/21 */ @Slf4j @Component diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java index f24984bc..8bd427f3 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/handler/qrscene/WeChatQrSceneMsgHandler.java @@ -11,7 +11,7 @@ import java.util.Map; * 微信扫码消息处理 * * @author xxm - * @date 2023/3/21 + * @since 2023/3/21 */ public interface WeChatQrSceneMsgHandler { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java index 56f159c9..22b95030 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/menu/WeChatMenuParam.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 微信自定义菜单 * * @author xxm - * @date 2022-08-08 + * @since 2022-08-08 */ @Data @Schema(title = "微信自定义菜单") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java index 9cfcd12b..53bfe8e9 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/notice/WeChatTemplateParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 微信消息模板 * * @author xxm - * @date 2022-08-03 + * @since 2022-08-03 */ @Data @Schema(title = "微信消息模板") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java index 4e40f153..8e3aec90 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/portal/WeChatPortalParam.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wechat.param.portal; * 微信返回的消息入参 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public class WeChatPortalParam { diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java index 647203f9..17b198b9 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/param/user/WechatFansParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; * 微信公众号粉丝 * * @author xxm - * @date 2022-07-16 + * @since 2022-07-16 */ @Data @Schema(title = "微信公众号粉丝") diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java index b9c6dfe1..9995319c 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/util/WeChatUtil.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * 微信工具类 * * @author xxm - * @date 2022/8/5 + * @since 2022/8/5 */ @UtilityClass public class WeChatUtil { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java index 88b5b69c..1f2b4f74 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/WeComAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan; * 企业微信 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java index b27a2095..802a2367 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/code/WeComCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.starter.wecom.code; * 企微常量 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public interface WeComCode { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java index 681ea296..7eb779a1 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java index 53cd1667..d3ee837a 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/configuration/WeComProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 企业微信配置 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @Getter @Setter diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java index dc46a1ff..c0cd78d4 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/controller/WecomRobotConfigController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Tag(name = "企业微信机器人配置") @RestController diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java index 86cc1eea..6283acee 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/executor/RecallNoticeRequestExecutor.java @@ -18,7 +18,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_MSG_ID; * 消息撤回请求执行器. * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public class RecallNoticeRequestExecutor implements RequestExecutor { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java index 57c7bdba..9c5f7c72 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/notice/service/WeComNoticeService.java @@ -24,7 +24,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.NOTICE_RECALL_URL; * 企业微信消息发送 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java index 477bcaab..35d481ed 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/convert/WecomRobotConfigConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Mapper public interface WecomRobotConfigConvert { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java index b3857d18..f69bbd12 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Repository @RequiredArgsConstructor diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java index 06bfb14b..3eee2d08 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/dao/WecomRobotConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Mapper public interface WecomRobotConfigMapper extends BaseMapper { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java index 8f797d65..8a4bb67d 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/domin/UploadMedia.java @@ -10,7 +10,7 @@ import java.io.InputStream; * 企微文件上传 * * @author xxm - * @date 2022/7/24 + * @since 2022/7/24 */ @Data @Accessors(chain = true) diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java index 0a71922a..b38199c7 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/entity/WecomRobotConfig.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java index 1b7299b6..b8abd006 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/executor/RobotMediaFileUploadRequestExecutor.java @@ -18,7 +18,7 @@ import java.io.IOException; * 机器人文件素材上传 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public class RobotMediaFileUploadRequestExecutor implements RequestExecutor { diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java index 524f1ad8..ee14630e 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WeComRobotNoticeService.java @@ -29,7 +29,7 @@ import static cn.bootx.platform.starter.wecom.code.WeComCode.ROBOT_UPLOAD_URL; * 企微机器人消息通知 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java index 33b1a7bb..c29ab88e 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/core/robot/service/WecomRobotConfigService.java @@ -21,7 +21,7 @@ import java.util.List; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Slf4j @Service diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java index e5448996..caa74343 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/dto/robot/WecomRobotConfigDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java index 0fa6cb42..6207c2c6 100644 --- a/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java +++ b/bootx-common-starters/common-starter-wecom/src/main/java/cn/bootx/platform/starter/wecom/param/robot/WecomRobotConfigParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 企业微信机器人配置 * * @author bootx - * @date 2022-07-23 + * @since 2022-07-23 */ @Data @Schema(title = "企业微信机器人配置") diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java index db4da7eb..f63761ca 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/CacheAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 缓存配置 * * @author xxm - * @date 2022/12/18 + * @since 2022/12/18 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java index e9955cd1..8952c96b 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCache.java @@ -11,7 +11,7 @@ import java.util.Objects; * 自定义RedisCache, 缓存值为空不报错 * * @author xxm - * @date 2021/7/6 + * @since 2021/7/6 */ public class BootxRedisCache extends RedisCache { diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java index 4aac9e54..588e0d4d 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/configuration/BootxRedisCacheManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 自定义Redis缓存管理 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ public class BootxRedisCacheManager extends RedisCacheManager { diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java index 941ff9cd..595bd9aa 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingConfiguration.java @@ -25,7 +25,7 @@ import java.time.Duration; * 缓存自动配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Configuration @EnableCaching diff --git a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java index 6551aaaf..45ddc1a6 100644 --- a/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java +++ b/bootx-commons/common-cache/src/main/java/cn/bootx/platform/common/cache/manager/CachingProperties.java @@ -11,7 +11,7 @@ import java.util.Map; * spring cache 配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java index d6f98fa4..812402f6 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/DataTranslateAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * 数据翻译模块 * * @author xxm - * @date 2022/12/27 + * @since 2022/12/27 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java index c09399cc..87627aee 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationAnnotationAdvisor.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; * 字段翻译切入点配置 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java index a6980fd2..ab91ded9 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/aop/TranslationInterceptor.java @@ -19,7 +19,7 @@ import java.util.Objects; * 字段翻译切点 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java index 24114714..0ba55529 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheFilter.java @@ -16,7 +16,7 @@ import java.io.IOException; * session缓存,用来减少一个请求中多次获取用户信息导致的多次访问redis * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Order(value = Integer.MIN_VALUE + 1) @Component diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java index 14dcd67f..cdd41026 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheLocal.java @@ -14,7 +14,7 @@ import java.util.Set; * 字典翻译缓存 * * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ @Slf4j @Service diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java index 50da1fb6..efe6202b 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2023/1/30 + * @since 2023/1/30 */ @Slf4j @Service diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java index e6b37cb5..83751d61 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/domain/ConvertInfo.java @@ -12,7 +12,7 @@ import java.lang.reflect.Field; * 字段信息 * * @author xxm - * @date 2023/1/31 + * @since 2023/1/31 */ @Getter @Setter diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java index a54914b9..75c3d085 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/TranslationHandler.java @@ -8,7 +8,7 @@ import java.lang.reflect.Type; * 字典值翻译接口 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ public interface TranslationHandler { diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java index 5ca4002e..de14acd8 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultObjectTranslationHandler.java @@ -16,7 +16,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 不为泛型类 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java index 0e9fc1ba..b9893a68 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageIterableTranslationHandler.java @@ -17,7 +17,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 为 Iterable 的实现, 比如 List * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java index 491e32f1..2ddff40d 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/handler/impl/ResultPageTranslationHandler.java @@ -19,7 +19,7 @@ import java.util.Map; * ResResult返回类的处理, 泛型 T 为分页类 * * @author xxm - * @date 2022/12/20 + * @since 2022/12/20 */ @Component @RequiredArgsConstructor diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java index 91b50bc9..a9776713 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/DictTranslationService.java @@ -2,7 +2,7 @@ package cn.bootx.platform.common.translate.service; /** * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ public interface DictTranslationService { diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java index 444565cb..ba39c3de 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/service/FieldTranslationService.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 翻译服务 * * @author xxm - * @date 2023/1/29 + * @since 2023/1/29 */ @Slf4j @Service diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java index 6db83bac..0e7ce71c 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/ExceptionHandlerAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 异常处理程序 * * @author xxm - * @date 2022/12/18 + * @since 2022/12/18 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java index 27e27ab3..e8fb36ca 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/ExceptionHandlerProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 配置 * * @author xxm - * @date 2021/12/5 + * @since 2021/12/5 */ @Getter @Setter diff --git a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java index 60e971b9..f6b84a26 100644 --- a/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java +++ b/bootx-commons/common-exception-handler/src/main/java/cn/bootx/platform/common/exceptionhandler/handler/RestExceptionHandler.java @@ -25,7 +25,7 @@ import javax.validation.ValidationException; * Web 项目异常处理 * * @author xxm - * @date 2020/5/8 15:30 + * @since 2020/5/8 15:30 */ @Slf4j @RestControllerAdvice diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java index 2a0d77d0..ed9b46c4 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/HeaderHolder.java @@ -14,7 +14,7 @@ import java.util.Objects; * 请求头获取工具类 * * @author xxm - * @date 2020/4/14 15:23 + * @since 2020/4/14 15:23 */ @UtilityClass public class HeaderHolder { diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java index ca8077d8..bf761c68 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/filter/WebHeaderHolderInterceptor.java @@ -17,7 +17,7 @@ import java.util.Enumeration; * 请求头保存 * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ @RequiredArgsConstructor @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java index e42e06c2..605cc701 100644 --- a/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java +++ b/bootx-commons/common-header-holder/src/main/java/cn/bootx/platform/common/headerholder/local/HolderContextHolder.java @@ -11,7 +11,7 @@ import java.util.Optional; * 请求头TTL存储类 * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ public final class HolderContextHolder { diff --git a/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java index 93927d3b..f62ca9f5 100644 --- a/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java +++ b/bootx-commons/common-idempotency/src/main/java/cn/bootx/platform/common/idempotency/aop/IdempotentAop.java @@ -23,7 +23,7 @@ import java.util.Locale; * 幂等处理器切面 * * @author xxm - * @date 2021/08/20 + * @since 2021/08/20 */ @Aspect @Slf4j diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java index c59159a3..0c69ecfb 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/JacksonAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * Jackson模块 * * @author xxm - * @date 2021/12/2 + * @since 2021/12/2 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java index 2379a351..866396bd 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/configuration/JacksonConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Primary; * jackson 序列化 * * @author xxm - * @date 2020/4/23 22:28 + * @since 2020/4/23 22:28 */ @Configuration @AutoConfigureBefore(JacksonAutoConfiguration.class) diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java index 9665f9a4..dfc1d39c 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/Java8TimeModule.java @@ -18,7 +18,7 @@ import java.time.format.DateTimeFormatter; * java8 时间序列化 * * @author xxm - * @date 2020/4/14 13:33 + * @since 2020/4/14 13:33 */ public class Java8TimeModule extends SimpleModule { diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java index d6807ab9..12d2cba7 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/jdk/JavaLongTypeModule.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; * Long 类型序列化为String * * @author xxm - * @date 2020/4/14 13:35 + * @since 2020/4/14 13:35 */ public class JavaLongTypeModule extends SimpleModule { diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java index d810a453..35322e08 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java @@ -12,7 +12,7 @@ import java.util.List; * jackson常用工具类封装 * * @author xxm - * @date 2020/11/29 + * @since 2020/11/29 */ @Slf4j public class JacksonUtil { diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java index 1ffc3501..48c04bb4 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/LogAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 日志扫描 * * @author xxm - * @date 2022/6/6 + * @since 2022/6/6 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java index c1cf646c..94065fcf 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/configuration/LogProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * 日志配置 * @author xxm - * @date 2023/3/29 + * @since 2023/3/29 */ @Getter @Setter diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java index a387c3bd..cdf58357 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/LogTraceHeaderHolderFilter.java @@ -20,7 +20,7 @@ import java.io.IOException; * 针对请求生成链路追踪ID * * @author xxm - * @date 2021/4/20 + * @since 2021/4/20 */ @Order(value = Integer.MIN_VALUE) @Component diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java index 36095bc6..8e96a349 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/handler/SensitiveDataLogConverter.java @@ -11,7 +11,7 @@ import java.util.Map; * 敏感数据脱敏 * * @author xxm - * @date 2021/1/4 + * @since 2021/1/4 */ public class SensitiveDataLogConverter extends MessageConverter { diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java index eabc4615..db8ad73d 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java @@ -19,7 +19,7 @@ import java.util.stream.IntStream; /** * PlumeLog日志删除定时任务的重新实现, 原有的日志清除逻辑是基于Lucene实现的, 文件夹将会残留, 同时还会创建出每个小时的新文件夹 * @author xxm - * @date 2023/3/29 + * @since 2023/3/29 */ @Component @ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") diff --git a/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java b/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java index 7b4baa76..abe6c5c3 100644 --- a/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java +++ b/bootx-commons/common-log/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -6,7 +6,7 @@ import org.slf4j.spi.MDCAdapter; * 静态 MDC 粘合剂 覆盖原始类 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ public class StaticMDCBinder { diff --git a/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java b/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java index 873c2fdd..c770e009 100644 --- a/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java +++ b/bootx-commons/common-log/src/main/java/org/slf4j/impl/TtlMDCAdapter.java @@ -12,7 +12,7 @@ import java.util.Set; * TTL MDC 适配器 覆盖原始类 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ public class TtlMDCAdapter implements MDCAdapter { diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java index 93ce76d8..a56c3c94 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/MongoCommonAutoConfiguration.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; * mongo配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java index 10006560..68c8fc50 100644 --- a/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java +++ b/bootx-commons/common-mongo/src/main/java/cn/bootx/platform/common/mongo/config/MongoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.data.mongodb.MongoTransactionManager; * mongo相关配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Slf4j @Configuration diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java index 7b9819b6..21b3c5f7 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/MybatisPlusCommonAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * mybatis自动配置 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @AutoConfiguration @ComponentScan diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java index ae7ccf2d..46708cbd 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpBaseEntity.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 基础实体类 (带软删除) * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java index fe0b318b..ba0a8f01 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/7/26 + * @since 2022/7/26 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java index f014f9f7..3f8f7d1d 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpDelEntity.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * MP基础类, 真实删除 * * @author xxm - * @date 2022/7/17 + * @since 2022/7/17 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java index 51551718..c8889509 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpIdEntity.java @@ -13,7 +13,7 @@ import java.io.Serializable; * mybatis plus id实体 * * @author xxm - * @date 2021/8/17 + * @since 2021/8/17 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java index 871b917c..b82055ad 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/configuration/MpConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; * mybatis自动配置 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java index 00b75369..57ab743b 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/extension/DataChangeRecorderInnerInterceptor.java @@ -55,7 +55,7 @@ import java.util.concurrent.ConcurrentHashMap; * 数据变动记录插件, 基于MP官方进行修改 * * @author xxm - * @date 2023/1/5 + * @since 2023/1/5 */ @Slf4j public class DataChangeRecorderInnerInterceptor implements InnerInterceptor { @@ -649,7 +649,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor { * 数据变动记录 * * @author xxm - * @date 2023/1/7 + * @since 2023/1/7 */ @Data public static class DataChangedRecord { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java index 54c9ebb9..053c2394 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java @@ -12,7 +12,7 @@ import org.apache.ibatis.type.MappedTypes; * Jackson 实现 JSON 字段类型处理器, 会记录对象属性类型, 通常用于被容器(List、Set、Map)包装的属性上 * * @author xxm - * @date 2022/7/11 + * @since 2022/7/11 */ @Slf4j @MappedTypes({ Object.class }) diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java index 9bb639db..1cf40a7c 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/SnowflakeIdentifierGenerator.java @@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor; * 雪花id生成器 * * @author xxm - * @date 2021/8/18 + * @since 2021/8/18 */ @RequiredArgsConstructor public class SnowflakeIdentifierGenerator implements IdentifierGenerator { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java index d57c94b4..9f81bf0d 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/impl/BaseManager.java @@ -34,7 +34,7 @@ import java.util.function.BiConsumer; * 自定义的基础数据库Manager操作类 类似自带的ServiceImpl类 * * @author xxm - * @date 2020/4/15 14:26 + * @since 2020/4/15 14:26 */ public class BaseManager, T> { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java index de233864..461f1955 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptor.java @@ -7,7 +7,7 @@ import lombok.*; * mp插件包装(支持排序) * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Getter @Setter diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java index 7ca2402d..b72b78bd 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/interceptor/MpInterceptorConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; * 插件容器 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Configuration public class MpInterceptorConfiguration { diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java index d7b4811a..fcb14607 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/util/MpUtil.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * MP工具类 * * @author xxm - * @date 2020/4/21 10:00 + * @since 2020/4/21 10:00 */ public class MpUtil { diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java index 015a0fd8..1b4cf0c3 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/RabbitMqCommonAutoConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * RabbitMQ配置 * * @author xxm - * @date 2022/5/3 + * @since 2022/5/3 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java index 17160cfe..b8b670c8 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/ConditionalOnRabbit.java @@ -12,7 +12,7 @@ import java.lang.annotation.*; * 从而避免`RabbitMQ`进行无限尝试重连服务器，导致项目一直抛出异常，影响开发和使用。 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java index d90e0141..8082675f 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/conditional/OnRabbitEnable.java @@ -10,7 +10,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * 判断是否在启用了Rabbit, 用来控制在没启用Rabbit情况下. 不将 @RabbitListener 修饰的监听器注册为Bean, 不然会导致无限尝试重连 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ public class OnRabbitEnable implements Condition { diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java index 162bcbe6..9dbdc715 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/BootxRabbitListenerConfigurer.java @@ -10,7 +10,7 @@ import org.springframework.messaging.handler.annotation.support.DefaultMessageHa * Rabbit 侦听器配置器 * * @author xxm - * @date 2021/6/25 + * @since 2021/6/25 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java index 211c67b0..fac5fb27 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqConfigurer.java @@ -14,7 +14,7 @@ import org.springframework.messaging.handler.annotation.support.DefaultMessageHa * 消息队列配置 * * @author xxm - * @date 2021/6/25 + * @since 2021/6/25 */ @EnableRabbit @Configuration diff --git a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java index 9ad3ad43..91c55d76 100644 --- a/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java +++ b/bootx-commons/common-rabbitmq/src/main/java/cn/bootx/platform/common/rabbit/configuration/RabbitMqProperties.java @@ -9,7 +9,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * MQTT配置 * * @author xxm - * @date 2022/12/12 + * @since 2022/12/12 */ @Getter @Setter diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java index a82f895c..c1b8d839 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisApplication.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan; * redis配置 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @ComponentScan public class RedisApplication { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java index 4d4af964..4769f76d 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/RedisClient.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; * redis请求类 * * @author xxm - * @date 2020/4/9 15:34 + * @since 2020/4/9 15:34 */ @RequiredArgsConstructor public class RedisClient { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java index 84878a06..78c3c770 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/code/RedisCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.code; * redis常量 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisCode { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java index 1cb50fd6..9c77c4a8 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * Redis配置 * * @author xxm - * @date 2020/4/9 15:40 + * @since 2020/4/9 15:40 */ @Configuration @ConditionalOnClass(StringRedisTemplate.class) diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java index f741a8d5..abd83f81 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredListener.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.listener; * Key过期事件 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisKeyExpiredListener { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java index 084a0313..e068ce75 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisKeyExpiredReceiver.java @@ -13,7 +13,7 @@ import java.util.List; * key过期事件接收 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @Slf4j @Component diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java index 8c8a6fbf..3ab36d72 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicListener.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.redis.listener; * redis订阅消息 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ public interface RedisTopicListener { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java index 3369732b..788d3a9a 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/listener/RedisTopicReceiver.java @@ -16,7 +16,7 @@ import java.util.List; * redis订阅消息接收 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @SuppressWarnings("rawtypes") @Slf4j diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java index c3307f86..fbb77973 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; * 只是在初始化时候使用一下，之后就会被替换 * * @author xxm - * @date 2022/11/30 + * @since 2022/11/30 */ public class RedissonClientTemporary implements RedissonClient { diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java index b7d2443b..3703bf8a 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonConfiguration.java @@ -19,7 +19,7 @@ import org.springframework.context.annotation.Configuration; * Redisson 自动配置 * * @author xxm - * @date 2022/12/19 + * @since 2022/12/19 */ @Configuration @ConditionalOnBean(name = "org.redisson.Redisson") diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java index 30059887..60dac221 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonLoadListener.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; * 项目启动时Redisson替换RedissonClient的实现, Redisson连接失败是会导致项目无法启动, 选择改为项目启动成功后, 替换掉原有的Bean * * @author xxm - * @date 2022/11/30 + * @since 2022/11/30 */ @Component @ConditionalOnBean(name = "org.redisson.Redisson") diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java index 7a559f6d..b6060afb 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/SequenceAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * sequence序列生成器 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java index 1cfa2507..46707e40 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceConfiguration.java @@ -14,7 +14,7 @@ import org.springframework.context.annotation.Primary; * 序列化生成器 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Configuration @RequiredArgsConstructor diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java index cdf1423c..c1e945bb 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/configuration/SequenceProperties.java @@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * 序列生成器参数 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Getter @Setter diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java index af3fb4ed..cc087eaa 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/impl/DefaultRangeSequence.java @@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock; * 序列号区间生成器接口默认实现 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Setter @Getter diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java index 420d0682..7a0b78d9 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/SeqRangeConfig.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 序列号区间配置 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java index 10690b25..b1e38c35 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcRangeHandler.java @@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional; * jdbc区间管理 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Service diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java index 744053be..97e0716c 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/JdbcSeqRangeManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 区间管理器jdbc数据库方式实现 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java index c8504e63..53416338 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRange.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java index 40c40a2d..38c969ae 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeManager.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Slf4j @Repository diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java index 37c54fff..30305b35 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/jdbc/SequenceRangeMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Mapper public interface SequenceRangeMapper extends BaseMapper { diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java index 7bb50705..3f3ef1df 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoRangeHandler.java @@ -15,7 +15,7 @@ import java.util.Optional; * Mongo区间处理器 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @ConditionalOnClass(name="org.springframework.data.mongodb.core.MongoTemplate") @Repository diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java index 1088b673..69bdc341 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/MongoSeqRangeManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 区间管理器MongoDB数据库方式实现 * * @author xxm - * @date 2022/1/21 + * @since 2022/1/21 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java index 16875b97..76b473c3 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/mongo/SequenceRange.java @@ -10,7 +10,7 @@ import org.springframework.data.mongodb.core.mapping.Document; * 队列区间 * * @author xxm - * @date 2021/12/14 + * @since 2021/12/14 */ @Data @FieldNameConstants diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java index 2232b23f..3957a8ee 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/range/redis/RedisSeqRangeManager.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; * Redis区间管理器 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ @Slf4j @Component diff --git a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java index 9c1a08a0..c44d4108 100644 --- a/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java +++ b/bootx-commons/common-sequence/src/main/java/cn/bootx/platform/common/sequence/util/SequenceUtil.java @@ -14,7 +14,7 @@ import java.util.Objects; * 序列号生成工具类 * * @author xxm - * @date 2022/12/27 + * @since 2022/12/27 */ @UtilityClass public class SequenceUtil { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java index e4af5f17..853e99e5 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/SpringConfigApplication.java @@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * spring默认配置 * @author xxm - * @date 2023/3/29 + * @since 2023/3/29 */ @EnableScheduling @EnableRetry diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java index f34c18b0..b09ba620 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/aop/CountTimeAop.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; * 方法耗时工具类 * * @author xxm - * @date 2020/12/22 + * @since 2020/12/22 */ @Aspect @Slf4j diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java index 71f04231..e300da4e 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/AsyncExecutorConfiguration.java @@ -15,7 +15,7 @@ import java.util.concurrent.Executor; * 异步执行配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Slf4j @EnableAsync diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java index 4880ce64..e03cb5da 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringCorsConfiguration.java @@ -18,7 +18,7 @@ import java.time.Duration; * 跨域处理 * * @author xxm - * @date 2021/7/14 + * @since 2021/7/14 */ @Configuration @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java index fd878e80..9954a55d 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringExecutorConfiguration.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutorService; * spring 线程池 配置 * * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Configuration @EnableConfigurationProperties({ SpringProperties.class }) diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java index e4d8825b..0d14392a 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/configuration/SpringProperties.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author xxm - * @date 2020/4/9 13:50 + * @since 2020/4/9 13:50 */ @ConfigurationProperties(prefix = "bootx.common.spring") @Data @@ -21,7 +21,7 @@ public class SpringProperties { /** * @author xxm - * @date 2021/6/11 + * @since 2021/6/11 */ @Data public static class Executor { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java index 1b495d61..2ece95f7 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/exception/RetryableException.java @@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.exception.BizException; * 可重试异常，抛出这个异常进行重试 * * @author xxm - * @date 2022/7/10 + * @since 2022/7/10 */ public class RetryableException extends BizException { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java index eef44db5..1f9f3b2b 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/AopUtil.java @@ -12,7 +12,7 @@ import java.lang.reflect.Method; * 切面工具类 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @UtilityClass public class AopUtil { diff --git a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java index 8e40a2be..c30f4292 100644 --- a/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java +++ b/bootx-commons/common-spring/src/main/java/cn/bootx/platform/common/spring/util/WebServletUtil.java @@ -13,7 +13,7 @@ import java.util.Optional; * web服务器工具类 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @UtilityClass public class WebServletUtil { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java index ab2a57d3..98a8ac20 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/QueryApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 高级查询器 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java index b622ea58..331d4f2b 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/CompareTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 匹配条件类型 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Getter @AllArgsConstructor diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java index 9ef82b34..0c739bcc 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/code/ParamTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * 参数类型 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Getter @AllArgsConstructor diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java index 37d87c8e..1378ee6a 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryBetweenParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * Between 类型参数 * * @author xxm - * @date 2021/11/18 + * @since 2021/11/18 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java index 1152a5b0..bf0d6c46 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryOrder.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java index f36fdfea..ee3f6af5 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParam.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java index 1da48793..790a2349 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/entity/QueryParams.java @@ -10,7 +10,7 @@ import java.util.List; * 查询参数 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ @Data @Accessors(chain = true) diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java index 800656e6..cd0fd530 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/AnnotationQueryGenerator.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * 注解参数查询生成器 * * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @UtilityClass public class AnnotationQueryGenerator { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java index f9fd67dd..e99294e1 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/ParamValueTypeConvert.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; * 参数值转换 * * @author xxm - * @date 2021/11/18 + * @since 2021/11/18 */ public class ParamValueTypeConvert { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java index 6b2169e3..555b1324 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/QueryGenerator.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; * 查询条件生成器 * * @author xxm - * @date 2021/11/17 + * @since 2021/11/17 */ public class QueryGenerator { diff --git a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java index c63374d4..1121ffbd 100644 --- a/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java +++ b/bootx-commons/common-super-query/src/main/java/cn/bootx/platform/common/query/generator/SuperQueryGenerator.java @@ -17,7 +17,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/12/14 + * @since 2022/12/14 */ @UtilityClass public class SuperQueryGenerator { diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java index c5e8c616..62fa2fcc 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerAutoConfiguration.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; * swagger 自动配置 * * @author xxm - * @date 2020/4/9 13:33 + * @since 2020/4/9 13:33 */ @Slf4j @Configuration diff --git a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java index dcaea363..800b113e 100644 --- a/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java +++ b/bootx-commons/common-swagger/src/main/java/cn/bootx/platform/common/swagger/SwaggerProperties.java @@ -12,7 +12,7 @@ import java.util.Map; * swagger配置 * * @author xxm - * @date 2020/4/9 13:36 + * @since 2020/4/9 13:36 */ @Getter @Setter diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java index 6b0d54ff..68a4c087 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/WebsocketAutoConfiguration.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.ComponentScan; /** * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @ComponentScan @AutoConfiguration diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java index c13ca9fe..c2fd21f8 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/code/WebsocketCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.websocket.code; * websocket常量码 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ public interface WebsocketCode { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java index 46f36d22..62d23f98 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/configuration/WebSocketConfig.java @@ -16,7 +16,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * Websocket配置 * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @EnableWebSocket @Configuration diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java index 569806be..de8ffe29 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsRes.java @@ -7,7 +7,7 @@ import lombok.experimental.UtilityClass; * websocket 响应工具类 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @UtilityClass public class WsRes { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java index fd54dcee..62b6d0e3 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/entity/WsResult.java @@ -12,7 +12,7 @@ import java.io.Serializable; * websocket响应消息类 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Getter @Setter diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java index d04b5395..70907e50 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/func/WsUserAuthService.java @@ -4,7 +4,7 @@ package cn.bootx.platform.common.websocket.func; * websocket用户认证相关接口 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ public interface WsUserAuthService { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java index 1eac21fc..e3f7aff5 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/SpringWebSocketSessionManager.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * websocket管理器 (Spring封装的socket) * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ public class SpringWebSocketSessionManager { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java index 9a92f04a..6bf60a1f 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/manager/WebSocketSessionManager.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; * websocket管理器 (java原生) * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ public class WebSocketSessionManager { diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java index 2110d3cb..c1898d91 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketHandler.java @@ -18,7 +18,7 @@ import static cn.bootx.platform.common.core.code.CommonCode.USER_ID; * 全局用户WS通知 * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @Slf4j @Component diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java index b18aef2f..7b30f730 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/notice/UserNoticeWebSocketInterceptor.java @@ -20,7 +20,7 @@ import static cn.bootx.platform.common.core.code.WebHeaderCode.ACCESS_TOKEN; * 全局用户WS通知拦截鉴权 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Component diff --git a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java index c5a898b9..beab13ef 100644 --- a/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java +++ b/bootx-commons/common-websocket/src/main/java/cn/bootx/platform/common/websocket/service/UserWsNoticeService.java @@ -13,7 +13,7 @@ import java.util.List; * 用户websocket方式发送通知消息 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Service diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java index 97b73a4c..cf38cba6 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/JobAutoConfiguration.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration; * xxl-job自动配置 * * @author xxm - * @date 2021/3/11 + * @since 2021/3/11 */ @Configuration @EnableConfigurationProperties(XxlJobProperties.class) diff --git a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java index 89cd4906..414855fb 100644 --- a/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java +++ b/bootx-commons/common-xxl-job/src/main/java/cn/bootx/platform/common/xxljob/XxlJobProperties.java @@ -7,7 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * xxl-job配置 * * @author xxm - * @date 2021/3/11 + * @since 2021/3/11 */ @Data @ConfigurationProperties(prefix = "bootx.common.xxl-job") diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java index 43197994..2a10348f 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/DemoApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 演示 * * @author xxm - * @date 2021/8/6 + * @since 2021/8/6 */ // 以这个类为 basePackageClasses @MapperScan(annotationClass = Mapper.class) // 扫描Mybatis 的 mapper diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java index 8d6a721f..3fa46a39 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/bsp/DictConvertDemoController.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author xxm - * @date 2022/12/19 + * @since 2022/12/19 */ @Tag(name = "字典测试") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java index 378a2761..0c79a6cf 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataEncryptDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Tag(name = "数据加密解密演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java index 69dca503..447f0824 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataPermDemoController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Tag(name = "数据权限演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java index 75c93b7e..cd1b7c9a 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/data/DataSensitiveDemoController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; * 数据脱敏演示 * * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Tag(name = "数据脱敏演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java index 6de82c4c..3530d881 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/lock/IdempotencyDemoController.java @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; * 幂等控制演示 * * @author xxm - * @date 2022/3/31 + * @since 2022/3/31 */ @Slf4j @Tag(name = "幂等控制演示") diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java index 983e6cc0..0589c59b 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/mq/MessageQueueDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Tag(name = "测试消息队列") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java index 85b4cf85..36020cd7 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/notice/EmailSendDemoController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Tag(name = "测试消息队列") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java index ac2a19ca..09fff558 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/query/SuperQueryDemoController.java @@ -19,7 +19,7 @@ import java.time.LocalTime; /** * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Tag(name = "超级查询演示") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java index 2afa138a..37e76843 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/controller/ws/GlobalWebsocketDemoController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/6/10 + * @since 2022/6/10 */ @Tag(name = "全局websocket通知demo") @RestController diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java index 5d0c1944..6d31919f 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java index 91757000..752178ba 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/dao/DataEncryptDemoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Mapper public interface DataEncryptDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java index 97ea1347..47f0c2d1 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/entity/DataEncryptDemo.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 权限显示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java index aa467c0d..b774140c 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/encrypt/service/DataEncryptDemoService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java index 0e2288a7..b5042a13 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttConfiguration.java @@ -11,7 +11,7 @@ /// ** // * // * @author xxm -// * @date 2022/5/30 +// * @since 2022/5/30 // */ // @Slf4j // @Configuration diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java index 7785ca9b..d298210c 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/mqtt/DemoMqttMessageListener.java @@ -8,7 +8,7 @@ /// ** // * mqtt消息接收器 // * @author xxm -// * @date 2022/5/30 +// * @since 2022/5/30 // */ // @Component // @RequiredArgsConstructor diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java index 5115fcf4..117f4b0c 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; * 演示RabbitMQ消息队列配置 * * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Configuration public class DemoRabbitMqConfiguration { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java index f1f2eda8..aae4c17b 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/rabbit/DemoRabbitMqMessageListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Slf4j @ConditionalOnRabbit diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java index b9d1eca0..5affc14d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisExpiredListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * redis过期事件监听 * * @author xxm - * @date 2022/5/30 + * @since 2022/5/30 */ @Slf4j @Component diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java index e79e2698..9855116d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisStreamListener.java @@ -8,7 +8,7 @@ import org.springframework.data.redis.stream.StreamListener; * RedisStream 消息队列 (未实现) * * @author xxm - * @date 2022/6/4 + * @since 2022/6/4 */ public class DemoRedisStreamListener implements StreamListener> { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java index 807329a8..3ab837b7 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mq/redis/DemoRedisTopicListener.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * 测试Redis消息队列 * * @author xxm - * @date 2022/5/7 + * @since 2022/5/7 */ @Slf4j @Component diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java index 63a4fcbd..63c3df1e 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/mtm/entity/MtmTableEntity.java @@ -14,7 +14,7 @@ import java.util.Date; * actable测试 * * @author xxm - * @date 2023/1/11 + * @since 2023/1/11 */ @EqualsAndHashCode(callSuper = true) @DbTable(name = "mtm_table",comment = "actable测试") diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java index 17a29627..e01cddac 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/entity/SendSimpleEmailDemoParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; * 简单邮件发送参数 * * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Data @Accessors(chain = true) diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java index 7c7caf45..0463de45 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/notice/service/EmailSendDemoService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 邮件消息发送测试 * * @author xxm - * @date 2022/8/3 + * @since 2022/8/3 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java index eddae2f4..91652a3d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoManager.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Repository; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java index 5e3f01d6..4f0c7ada 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/dao/DataPermDemoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 数据权限演示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Mapper public interface DataPermDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java index b392f092..58a8a567 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/entity/DataPermDemo.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 权限显示demo * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @DataVersionLog(title = "数据权限演示") @EqualsAndHashCode(callSuper = true) diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java index 5c71335c..bbc68b2f 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/perm/service/DataPermDemoService.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; * 数据权限演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java index 5fec740b..886e7410 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoManager.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Repository; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java index aeed0b2b..70edb704 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/dao/SuperQueryDemoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Mapper public interface SuperQueryDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java index 8baaa25e..94a15b6d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/entity/SuperQueryDemo.java @@ -15,7 +15,7 @@ import java.time.LocalTime; * 超级查询演示 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java index f6f3dd61..1c36a3f3 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; * 超级查询 * * @author xxm - * @date 2022/2/21 + * @since 2022/2/21 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java index 3b17305f..4ad228de 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Repository diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java index dc89d361..c19df433 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/dao/DataSensitiveDemoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Mapper public interface DataSensitiveDemoMapper extends BaseMapper { diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java index 0c19d62d..d70a7cb2 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/entity/DataSensitiveDemo.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据脱敏 * * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java index 111eca4e..5f5dfb4d 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/sensitive/service/DataSensitiveDemoService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; /** * @author xxm - * @date 2022/3/24 + * @since 2022/3/24 */ @Slf4j @Service diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java index 2ec6daba..56ce5764 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/ws/WebSocketDemo.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; * websocket demo * * @author xxm - * @date 2022/3/27 + * @since 2022/3/27 */ @Slf4j @Component diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java index 11756ff0..8a833a03 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/BaseApiApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 基础功能 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java index 0e9d2d0f..d16cac23 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/CachingCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.baseapi.code; * 缓存 * * @author xxm - * @date 2022/5/1 + * @since 2022/5/1 */ public interface CachingCode { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java index 40aa3a09..f7097a19 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/ChinaRegionCode.java @@ -10,7 +10,7 @@ import java.util.Arrays; * 中国行政区划 * * @author xxm - * @date 2023/2/7 + * @since 2023/2/7 */ @Getter @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java index 3f228142..09200c52 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/QuerySqlCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.baseapi.code; * 查询SQL * * @author xxm - * @date 2023/3/12 + * @since 2023/3/12 */ public interface QuerySqlCode { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java index a5cf7337..9204b883 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Tag(name = "app版本管理") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java index 6367424e..d1e89202 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/CaptchaController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * 验证码服务 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Tag(name = "验证码服务") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java index 4e7edd5a..7e482e66 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaRegionController.java @@ -17,7 +17,7 @@ import java.util.List; * 中国行政区划 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Tag(name = "中国行政区划") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java index 49372c75..b394edd3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryController.java @@ -20,7 +20,7 @@ import java.util.List; * 字典 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Tag(name = "字典") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java index a7162501..8d4358f1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DictionaryItemController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2020/4/18 19:03 + * @since 2020/4/18 19:03 */ @Tag(name = "字典项") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java index f0b13d6e..76212c55 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicDataSourceController.java @@ -19,7 +19,7 @@ import java.util.List; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Tag(name = "动态数据源管理") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java index c1841efe..a5e0306d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormController.java @@ -18,7 +18,7 @@ import java.util.List; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Tag(name = "动态表单") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java index 16e20e4a..cbeb9b66 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/DynamicFormDataController.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @Tag(name = "动态表单数据") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java index 94b4959a..2cb823ca 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java @@ -19,7 +19,7 @@ import java.util.Map; * SQL查询 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Tag(name = "SQL查询") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java index fcf61835..b1984723 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/SystemParamController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Tag(name = "系统参数") @RestController diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java index bb39a7b2..4b9628ab 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 转换 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Mapper public interface AppVersionConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java index 789c5565..f4161da1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * app版本管理 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java index fb0bfeca..c3254a3b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * app版本 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Mapper public interface AppVersionMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java index 96476354..49c71553 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * App版本 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java index f71a56b5..c086eb2c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java @@ -18,7 +18,7 @@ import java.util.Optional; * 版本管理 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java index 4eefbb06..148826dd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java @@ -15,7 +15,7 @@ import java.util.Objects; * 验证码服务 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java index 58ea966f..18799659 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/convert/DictionaryConvert.java @@ -14,7 +14,7 @@ import org.mapstruct.factory.Mappers; * 渠道转换 * * @author xxm - * @date 2021/7/6 + * @since 2021/7/6 */ @Mapper public interface DictionaryConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java index 61c8fa6c..b8717be6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemManager.java @@ -16,7 +16,7 @@ import java.util.Optional; * 字典项 * * @author xxm - * @date 2020/4/21 14:08 + * @since 2020/4/21 14:08 */ @Repository @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java index 6626e8e0..2a9070e2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryItemMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 字典项 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Mapper public interface DictionaryItemMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java index b6a4e7fc..29677dea 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryManager.java @@ -17,7 +17,7 @@ import java.util.List; * 字典 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Repository @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java index 99822895..63f3f3d5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/dao/DictionaryMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 字典 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Mapper public interface DictionaryMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java index 7b5a9e81..1fded296 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/Dictionary.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 字典 * * @author xxm - * @date 2020/11/13 + * @since 2020/11/13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java index 0a04a0f7..3f223749 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/entity/DictionaryItem.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 字典项 * * @author xxm - * @date 2020/4/15 17:45 + * @since 2020/4/15 17:45 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java index 5dd95324..991591bc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictTranslationServiceImpl.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 字典值转换工具类 * * @author xxm - * @date 2022/12/15 + * @since 2022/12/15 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java index d3047f86..0f39905e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryItemService.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/16 21:16 + * @since 2020/4/16 21:16 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java index a29e2e15..9e4a8aaf 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dict/service/DictionaryService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/10 15:52 + * @since 2020/4/10 15:52 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java index 57e799ab..37c0f81d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/convert/DynamicFormConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Mapper public interface DynamicFormConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java index 05b68eaf..8e5e18cd 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormManager.java @@ -16,7 +16,7 @@ import java.util.Objects; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java index b8a68c69..2569468b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/dao/DynamicFormMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Mapper public interface DynamicFormMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java index f40023cd..bc1b0da2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicForm.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java index 216d0d2f..f130db13 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/entity/DynamicFormData.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/30 + * @since 2022/7/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java index ac815f77..886636af 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormDataService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 动态表单数据收集 * * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java index eeb09bc5..39c93a1e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicform/service/DynamicFormService.java @@ -21,7 +21,7 @@ import java.util.List; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java index 02956b1b..d39fc09b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/convert/DynamicDataSourceConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Mapper public interface DynamicDataSourceConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java index 841a9249..4639c460 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java index 9085dbcd..f59b19d1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/dao/DynamicDataSourceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Mapper public interface DynamicDataSourceMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java index e610a98c..84de88d5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/entity/DynamicDataSource.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java index 0862e520..5a869aa1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/dynamicsource/service/DynamicDataSourceService.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; * 动态数据源管理 * * @author xxm - * @date 2022/9/24 + * @since 2022/9/24 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java index 4912240d..52cee883 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java index 6830b32f..367dbfea 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/dao/SysKeyValueMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Mapper public interface SysKeyValueMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java index 8bc10663..45e0258b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * kv存储 * * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java index af2c90a8..c994548d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * kv存储 * * @author xxm - * @date 2022/3/30 + * @since 2022/3/30 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java index 6dfecc4e..2890c70e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/convert/SystemConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 系统参数和系统配置实体类转换 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Mapper public interface SystemConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java index db70e0ea..200bd344 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamManager.java @@ -22,7 +22,7 @@ import java.util.Optional; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java index 02b3be62..04b29db1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/dao/SystemParamMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Mapper public interface SystemParamMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java index bb75d4c9..58676f5f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/entity/SystemParameter.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java index e195a8d1..fa75fe8c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java @@ -24,7 +24,7 @@ import java.util.Objects; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java index 2b159387..4b152328 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaManager.java @@ -11,7 +11,7 @@ import java.util.List; * 区域表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java index 5cb4759c..955fce5b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/AreaMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 区域表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface AreaMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java index 34de0432..35844aa6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityManager.java @@ -11,7 +11,7 @@ import java.util.List; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java index 0f906aed..527e5b0d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/CityMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface CityMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java index 07dc2d32..ac27e072 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceManager.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java index 536a801d..8ef0286f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/ProvinceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface ProvinceMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java index cab30559..62d517f7 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetManager.java @@ -11,7 +11,7 @@ import java.util.List; * 街道表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java index 58114551..7a68223d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/StreetMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 街道表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Mapper public interface StreetMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java index aeaf3a13..8855d791 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageManager.java @@ -11,7 +11,7 @@ import java.util.List; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java index d13742a4..dacf9cb6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/dao/VillageMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Mapper public interface VillageMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java index d7a96d48..70f44419 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Area.java @@ -9,7 +9,7 @@ import lombok.Data; * 区域表(县区) * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_area") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java index aea0abed..64cf37eb 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/City.java @@ -9,7 +9,7 @@ import lombok.Data; * 城市表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_city") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java index 23d40b86..2f631cdc 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Province.java @@ -9,7 +9,7 @@ import lombok.Data; * 省份表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_province") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java index db073700..5091b134 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Street.java @@ -9,7 +9,7 @@ import lombok.Data; * 街道/乡镇表 * * @author xxm - * @date 2022-12-24 + * @since 2022-12-24 */ @Data @TableName("base_street") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java index 3211ccdd..67bf3498 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/entity/Village.java @@ -9,7 +9,7 @@ import lombok.Data; * 村庄/社区 * * @author xxm - * @date 2023/2/3 + * @since 2023/2/3 */ @Data @TableName("base_village") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java index 3f54f6ef..4a643f17 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/region/service/ChinaRegionService.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * 中国行政区划 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java index ffbeedde..c29ab9c3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/convert/QuerySqlConvert.java @@ -8,7 +8,7 @@ import org.mapstruct.factory.Mappers; /** * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @Mapper public interface QuerySqlConvert { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java index 022dd6be..7b726ae3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlManager.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Slf4j @Repository diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java index 714cff92..6dc01155 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/dao/QuerySqlMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Mapper public interface QuerySqlMapper extends BaseMapper { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java index c002d399..55ca5930 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/entity/QuerySql.java @@ -18,7 +18,7 @@ import java.util.List; * SQL查询语句 * * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java index 109cb840..dd51a369 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Slf4j @Service diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java index daf3a20e..cf511e75 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java index 9f8c052e..936dd5f6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 验证码数据 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java index 95c26c89..d02e1ec8 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 14:46 + * @since 2020/4/10 14:46 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java index 5a2c60f6..795df443 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 数据字典项 * * @author xxm - * @date 2020/4/15 17:55 + * @since 2020/4/15 17:55 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java index fcdc37f9..f783364f 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dict/DictionaryItemSimpleDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 数据字典项(简单) * * @author xxm - * @date 2020/4/15 17:55 + * @since 2020/4/15 17:55 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java index 3556811c..8e886ab8 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicform/DynamicFormDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java index 559c1db5..13ce13a6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/dynamicsource/DynamicDataSourceDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java index ad784451..cf24d18c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/parameter/SystemParameterDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java index 4191699e..dae3b9b0 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/region/RegionDto.java @@ -13,7 +13,7 @@ import java.util.List; * 中国行政区域通用对象 * * @author xxm - * @date 2022/12/24 + * @since 2022/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java index ef88e747..97f2a164 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/sql/QuerySqlDto.java @@ -12,7 +12,7 @@ import java.util.List; /** * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java index af538821..5b138b97 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictAlreadyExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 15:14 + * @since 2020/4/10 15:14 */ public class DictAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java index f7e5bedc..0bcdef39 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictChildItemExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/16 22:08 + * @since 2020/4/16 22:08 */ public class DictChildItemExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java index be99f9e1..60e67264 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:53 + * @since 2020/4/21 11:53 */ public class DictItemAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java index 18a36810..294af1e3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemAlreadyUsedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:54 + * @since 2020/4/21 11:54 */ public class DictItemAlreadyUsedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java index b3fe17f5..236367f7 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictItemNotExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:54 + * @since 2020/4/21 11:54 */ public class DictItemNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java index ab64a684..ce7e0be1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/exception/dict/DictNotExistedException.java @@ -7,7 +7,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/21 11:53 + * @since 2020/4/21 11:53 */ public class DictNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java index f2b5897d..28775ba5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/dynamicsource/DynamicDataSourceLoadHandler.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; /** * 初始化数据源函数 * @author xxm - * @date 2023/5/17 + * @since 2023/5/17 */ @Slf4j @Component diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java index 1b67aff1..06b5b98c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/mp/MpMetaObjectHandler.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * mp自动填充值 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Component public class MpMetaObjectHandler implements MetaObjectHandler { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java index 05ad3b0a..df05b34d 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/handler/region/ChinaRegionInitSqlHandler.java @@ -10,7 +10,7 @@ import java.util.List; * 行政区域初始化 * * @author xxm - * @date 2023/2/7 + * @since 2023/2/7 */ @Component public class ChinaRegionInitSqlHandler extends SimpleDdl { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java index d62cd066..8bca41b1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * app版本参数 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java index aba346a7..e8be3376 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryItemParam.java @@ -14,7 +14,7 @@ import java.io.Serializable; * 字典项参数 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java index 6a6dc4e8..359f57ab 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dict/DictionaryParam.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/4/10 14:46 + * @since 2020/4/10 14:46 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java index ac102347..9a3874e6 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicform/DynamicFormParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 动态表单 * * @author xxm - * @date 2022-07-28 + * @since 2022-07-28 */ @Data @Schema(title = "动态表单") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java index fa7f375a..f79eb52b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/dynamicsource/DynamicDataSourceParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 动态数据源管理 * * @author xxm - * @date 2022-09-24 + * @since 2022-09-24 */ @Data @Schema(title = "动态数据源管理") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java index a11d8972..78150d81 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QueryFieldParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2023/3/9 + * @since 2023/3/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java index 6a5d549e..b0d620d3 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/sql/QuerySqlParam.java @@ -12,7 +12,7 @@ import java.util.List; * 查询语句参数类 * * @author xxm - * @date 2023/3/13 + * @since 2023/3/13 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java index 0b2a1a99..beea6f21 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/system/SystemParameterParam.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Null; * 系统参数 * * @author xxm - * @date 2021/10/25 + * @since 2021/10/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java index 33566bd6..fd5329e2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/IamApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 身份识别与访问管理 * * @author xxm - * @date 2021/7/29 + * @since 2021/7/29 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java index 3a7db05e..3c382a4b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/CachingCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 缓存名称 * * @author xxm - * @date 2021/6/16 + * @since 2021/6/16 */ public interface CachingCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java index 236f4566..43cd6030 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/IamErrorCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 用户中心错误码(21000-21999) * * @author xxm - * @date 2020/4/24 16:01 + * @since 2020/4/24 16:01 */ public interface IamErrorCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java index 3f85fe41..64070b64 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/OrgCategoryCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 部门组织机构类型 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ public interface OrgCategoryCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java index 55be6a73..bb647181 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/PermissionCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 权限相关编码 * * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ public interface PermissionCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java index 25490690..07f9d17d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/code/UserStatusCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.iam.code; * 用户状态码 * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ public interface UserStatusCode { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java index 3040af5a..0a1acc23 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/AuthAssistController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; /** * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Tag(name = "认证支撑接口") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java index 46b77817..631ea449 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ClientController.java @@ -18,7 +18,7 @@ import java.util.List; * 认证终端 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Tag(name = "认证终端") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java index ed1560a7..6e0cb7b6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DataScopeController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Tag(name = "数据范围权限配置") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java index 061d3613..215fba1f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/DeptController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/10 + * @since 2020/5/10 */ @Tag(name = "部门管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java index 429eae8d..aecb33de 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/LoginTypeController.java @@ -20,7 +20,7 @@ import java.util.List; * 登录方式 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Tag(name = "登录方式管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java index a695dfa6..f946dc38 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermMenuController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/11 9:36 + * @since 2020/5/11 9:36 */ @Tag(name = "菜单权限资源") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java index 5951759c..84392123 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/PermPathController.java @@ -21,7 +21,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/11 9:36 + * @since 2020/5/11 9:36 */ @Validated @Tag(name = "请求权限资源") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java index 7f9e1d98..de572def 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java @@ -18,7 +18,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Tag(name = "角色管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java index c80d60aa..3bb11af7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleMenuController.java @@ -18,7 +18,7 @@ import java.util.List; * 角色权限(菜单)关联关系 * * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @Tag(name = "角色菜单权限关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java index 07cc8d29..f95eb300 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RolePathController.java @@ -15,7 +15,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Tag(name = "角色请求权限消息关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java index 2f78fe3e..e047a6f2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/ThirdLoginController.java @@ -21,7 +21,7 @@ import java.io.IOException; * 三方登录 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Slf4j @IgnoreAuth diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java index c4013a5e..227513d3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java @@ -23,7 +23,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/6 + * @since 2021/9/6 */ @Validated @Tag(name = "管理用户(管理员级别)") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java index d0666b27..92e3380a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAssistController.java @@ -20,7 +20,7 @@ import javax.validation.constraints.NotBlank; * 用户操作支撑服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Validated @IgnoreAuth(ignore = false, login = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java index 217eea37..1765bc87 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDataScopeController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Tag(name = "用户数据权限配置") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java index fcc85184..fa08a459 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserDeptController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Tag(name = "用户部门关联关系") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java index 98d83c8d..ca092e7b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserInfoController.java @@ -22,7 +22,7 @@ import javax.validation.constraints.NotBlank; /** * @author xxm - * @date 2020/4/25 20:02 + * @since 2020/4/25 20:02 */ @Validated @IgnoreAuth diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java index 147089fa..fe62e4d5 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserRoleController.java @@ -16,7 +16,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:09 + * @since 2020/5/1 18:09 */ @Tag(name = "用户角色管理") @RestController diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java index 8e1b580d..415182f6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserThirdController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotBlank; * 用户三方登录管理 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Validated @Tag(name = "用户三方登录管理") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java index 041d82d1..0cb474d8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 获取认证应用 * * @author xxm - * @date 2022/6/27 + * @since 2022/6/27 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java index b2e7875e..a8f59643 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 获取认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java index c0304631..7cd83ce0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginFailureHandlerImpl.java @@ -23,7 +23,7 @@ import java.util.Optional; * 登录失败 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java index d7236e81..f1601532 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/LoginSuccessHandlerImpl.java @@ -23,7 +23,7 @@ import java.util.Optional; * 登录成功处理 * * @author xxm - * @date 2021/8/13 + * @since 2021/8/13 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java index 19350876..af48a97f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/DingTalkLoginHandler.java @@ -33,7 +33,7 @@ import java.util.Objects; * 钉钉登录 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java index 7b488c0d..83cd5d89 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java @@ -29,7 +29,7 @@ import java.util.Objects; * 账号密码登陆方式实现 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java index 326bf5a7..268b61e4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PhoneLoginHandler.java @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; * 手机号登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java index 15a9116e..9c3be64e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatLoginHandler.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; * 微信登录(公众号) * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java index b851d1bc..477be393 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatOpenLoginHandler.java @@ -30,7 +30,7 @@ import java.util.Objects; * 微信开放平台登录 * * @author xxm - * @date 2022/8/4 + * @since 2022/8/4 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java index bf99f0d3..fa9a0e08 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeComLoginHandler.java @@ -30,7 +30,7 @@ import java.util.Objects; * 企业微信登录 * * @author xxm - * @date 2022/6/30 + * @since 2022/6/30 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java index e901edac..abbbc951 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * 认证支撑服务 * * @author xxm - * @date 2021/9/9 + * @since 2021/9/9 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java index 41633619..11599b6a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/ThirdLoginService.java @@ -14,7 +14,7 @@ import java.util.List; * 三方登录 * * @author xxm - * @date 2022/6/29 + * @since 2022/6/29 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java index 571a7fe2..5c422a13 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/ClientConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Mapper public interface ClientConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java index 0c3af1ac..b6c68088 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/convert/LoginTypeConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 认证终端 * * @author bootx - * @date 2022-02-20 + * @since 2022-02-20 */ @Mapper public interface LoginTypeConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java index af97690a..ac92c0f4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java index 089967f9..c097acbb 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Mapper public interface ClientMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java index 7d517633..eff57bdc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeManager.java @@ -19,7 +19,7 @@ import java.util.Optional; * 终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java index d281c48d..3fb7861d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/LoginTypeMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Mapper public interface LoginTypeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java index 3f56b624..54b95384 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java index 5400b74f..fefb4fe2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 登录方式 * * @author xxm - * @date 2022/7/5 + * @since 2022/7/5 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java index 7f00ccb7..e039cc1d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/ClientService.java @@ -22,7 +22,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java index ff6d9a9d..09a4ed75 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/service/LoginTypeService.java @@ -23,7 +23,7 @@ import java.util.List; * 终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java index 5adda6a9..e393e668 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/convert/DeptConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 部门机构转换 * * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @Mapper public interface DeptConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java index 82fc6958..e4b8a079 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptManager.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2020/5/7 17:42 + * @since 2020/5/7 17:42 */ @Repository public class DeptManager extends BaseManager { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java index b8235f20..c604f979 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/dao/DeptMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 部门 * * @author xxm - * @date 2020/5/7 17:40 + * @since 2020/5/7 17:40 */ @Mapper public interface DeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java index 221d8c00..ef38741a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/entity/Dept.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 部门表 * * @author xxm - * @date 2020/5/7 17:38 + * @since 2020/5/7 17:38 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java index ea5a7be0..37ac99e3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/event/DeptDeleteEvent.java @@ -9,7 +9,7 @@ import java.util.List; * 部门删除事件 * * @author xxm - * @date 2022/1/3 + * @since 2022/1/3 */ @Getter public class DeptDeleteEvent extends ApplicationEvent { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java index 0340babf..925fc7e7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptRuleService.java @@ -17,7 +17,7 @@ import java.util.*; * 部门规则工具类 * * @author xxm - * @date 2020/5/10 15:01 + * @since 2020/5/10 15:01 */ @Service @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java index c7bf4f06..ece77efd 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/dept/service/DeptService.java @@ -25,7 +25,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; /** * @author xxm - * @date 2020/5/7 17:42 + * @since 2020/5/7 17:42 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java index 78e3a3ab..16683976 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/convert/PermConvert.java @@ -14,7 +14,7 @@ import org.mapstruct.factory.Mappers; * 权限转换 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface PermConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java index eb468c85..633ce77a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuManager.java @@ -13,7 +13,7 @@ import java.util.List; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java index c33cb1a9..c00ee599 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermMenuMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface PermMenuMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java index f9614f67..ec611c33 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathManager.java @@ -18,7 +18,7 @@ import java.util.List; * 权限 * * @author xxm - * @date 2020/5/10 23:27 + * @since 2020/5/10 23:27 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java index d3f79420..4ce66103 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/dao/PermPathMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 权限 * * @author xxm - * @date 2020/5/10 23:26 + * @since 2020/5/10 23:26 */ @Mapper public interface PermPathMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java index c587757a..0486b8a6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermMenu.java @@ -18,7 +18,7 @@ import static com.baomidou.mybatisplus.annotation.FieldStrategy.IGNORED; * 权限配置 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java index df268495..5058e4ef 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/PermPath.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 权限资源(url请求) * * @author xxm - * @date 2020/5/10 23:09 + * @since 2020/5/10 23:09 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java index 3db10b0d..bf164f63 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/entity/RequestPath.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 请求权限 * * @author xxm - * @date 2021/12/19 + * @since 2021/12/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java index 3f7826ec..5c33cacf 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermCodeService.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; * 权限码管理 * * @author xxm - * @date 2023/1/23 + * @since 2023/1/23 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java index 346178ec..c933bfd4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermMenuService.java @@ -32,7 +32,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 权限 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java index 8c6cdd44..13ca3341 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/PermPathService.java @@ -42,7 +42,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 请求权限 * * @author xxm - * @date 2020/5/10 23:20 + * @since 2020/5/10 23:20 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java index c11b296a..bd3a4ad4 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/permission/service/RequestPathService.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 请求权限处理 * * @author xxm - * @date 2021/12/19 + * @since 2021/12/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java index a830c57a..ad89763a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleManager.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java index f51a7346..3302a24c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/dao/RoleMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface RoleMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java index e194b1cd..7ef021db 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/entity/Role.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * 角色 * * @author xxm - * @date 2020/5/1 17:31 + * @since 2020/5/1 17:31 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java index 3503a482..f76e9f03 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/role/service/RoleService.java @@ -32,7 +32,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 角色 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java index 46aca4c4..fe9ed00b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/convert/DataScopeConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 数据范围转换类 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java index fce45e67..2bb40fb9 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptManager.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java index 2ec32af4..b5cec7f8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeDeptMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeDeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java index c6b2e37e..3b8e4165 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeManager.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java index 71874fc9..ab11b70d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java index cd2cb650..5547226a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserManager.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java index d082f37a..d0b4b0b2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/dao/DataScopeUserMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface DataScopeUserMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java index 835afad3..caa5314a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScope.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; * 数据范围配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java index b315e677..88c614df 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeDept.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据范围部门关联配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java index 0ba35651..bfad8253 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/entity/DataScopeUser.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 数据范围用户关联配置 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java index a1ace83f..4ef76cfa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeService.java @@ -38,7 +38,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 数据范围权限 * * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java index 6473c868..97f1954e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/scope/service/DataScopeUserService.java @@ -28,7 +28,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 数据范围权限限定用户级别 * * @author xxm - * @date 2022/1/4 + * @since 2022/1/4 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java index c09aaa19..573eaf0d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/convert/UserThirdInfoConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Mapper public interface UserThirdInfoConvert { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java index 7a1384d6..4230a992 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java index a60adef8..6cd44570 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdInfoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Mapper public interface UserThirdInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java index 1b721428..9debeb1d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdManager.java @@ -17,7 +17,7 @@ import java.util.Optional; * 三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java index c6750b01..030bd181 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/dao/UserThirdMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Mapper public interface UserThirdMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java index 7af2611e..b7b44804 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThird.java @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; * 用户三方登录 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java index 9e06dff5..147c7179 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/entity/UserThirdInfo.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java index 4e17591b..fa10f824 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java @@ -20,7 +20,7 @@ import java.util.List; * 三方账号绑定 * * @author xxm - * @date 2021/8/2 + * @since 2021/8/2 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java index c7af1983..4fb19099 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * 用户三方账号查询 * * @author xxm - * @date 2022/4/2 + * @since 2022/4/2 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java index 95822a93..f0474293 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java @@ -22,7 +22,7 @@ import java.util.function.BiConsumer; * 用户绑定操作类 * * @author xxm - * @date 2022/7/22 + * @since 2022/7/22 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java index 8a5d6d03..89bd2768 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuManager.java @@ -14,7 +14,7 @@ import java.util.List; * 角色权限关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java index ab7d31ff..c9d298c6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RoleMenuMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 角色权限关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface RoleMenuMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java index 0d6da544..11745f41 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathManager.java @@ -13,7 +13,7 @@ import java.util.List; * 角色权限 * * @author xxm - * @date 2020/5/27 16:02 + * @since 2020/5/27 16:02 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java index 6b4cb485..61efa044 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/RolePathMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 角色权限 * * @author xxm - * @date 2020/11/14 + * @since 2020/11/14 */ @Mapper public interface RolePathMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java index 27f9e7f3..3e397a0b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeManager.java @@ -13,7 +13,7 @@ import java.util.Optional; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java index 702ee2ff..9627e8de 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserDataScopeMapper.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Mapper public interface UserDataScopeMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java index 712c6dc5..3e50c1de 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleManager.java @@ -14,7 +14,7 @@ import java.util.List; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java index 73ec012e..4155234a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/dao/UserRoleMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Mapper public interface UserRoleMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java index e2cd3165..90eba287 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RoleMenu.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 角色权限关联关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java index d479e472..35b7edb2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/RolePath.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 角色路径权限表 * * @author xxm - * @date 2020/5/11 22:25 + * @since 2020/5/11 22:25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java index f50f7af1..065169a0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserDataScope.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 用户数据范围关联关系 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java index 19fe395d..f4853525 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/entity/UserRole.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 用户角色关系 * * @author xxm - * @date 2020/5/1 11:18 + * @since 2020/5/1 11:18 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java index 12b23fcf..920ed563 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePathService.java @@ -30,7 +30,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PATH; * 角色请求权限关系 * * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java index cebada4c..b1df9935 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/RolePermService.java @@ -33,7 +33,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 角色权限菜单关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java index 375c48d6..ed02f427 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java @@ -42,7 +42,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_DATA_SCOPE; * 用户数据权限关联关系 * * @author xxm - * @date 2021/12/23 + * @since 2021/12/23 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java index 606e7845..4ffda028 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java @@ -25,7 +25,7 @@ import static cn.bootx.platform.iam.code.CachingCode.USER_PERM_CODE; * 用户角色关系 * * @author xxm - * @date 2021/8/3 + * @since 2021/8/3 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java index a0a7c013..952a2b84 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptManager.java @@ -14,7 +14,7 @@ import java.util.List; * 用户部门关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java index d8e03d01..86bdcbdc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserDeptMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 用户部门关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Mapper public interface UserDeptMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java index ef7749e8..20cb287e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoManager.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; * 用户扩展信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Slf4j @Repository diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java index 51316d99..3c98f354 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserExpandInfoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Mapper public interface UserExpandInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java index 644cfa0b..5f206b03 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 用户信息 * * @author xxm - * @date 2020/4/24 15:32 + * @since 2020/4/24 15:32 */ @Repository @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java index 089f906c..c264c513 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/dao/UserInfoMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 用户信息 * * @author xxm - * @date 2021/7/30 + * @since 2021/7/30 */ @Mapper public interface UserInfoMapper extends BaseMapper { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java index d555f2e6..937182e1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserDept.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 用户部门关联关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java index 737ac563..d567b083 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserExpandInfo.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; * 用户扩展信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java index 2d42ee66..efff964f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/entity/UserInfo.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 用户的核心信息 * * @author xxm - * @date 2020/4/24 15:21 + * @since 2020/4/24 15:21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java index 2d074400..b09d3833 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java @@ -8,7 +8,7 @@ import org.springframework.context.ApplicationEvent; * 用户创建事件 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Getter public class UserCreateEvent extends ApplicationEvent { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java index 9b691ad6..644660e0 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; * 超级管理员操作类 * * @author xxm - * @date 2021/9/6 + * @since 2021/9/6 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java index 74e4860d..bc2cff48 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAssistService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 用户操作支撑服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java index b3cfbd6c..cf092c7e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserDeptService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 用户部门关联关系 * * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java index c74db26c..02b45069 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserExpandInfoService.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * 用户扩展信息服务 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java index e0988a07..6bf7eeb9 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java @@ -24,7 +24,7 @@ import java.time.LocalDateTime; * 用户 * * @author xxm - * @date 2020/4/27 21:11 + * @since 2020/4/27 21:11 */ @Service @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java index 169a3261..55a1a119 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserQueryService.java @@ -18,7 +18,7 @@ import java.util.Optional; * 用户信息查询服务 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java index 1b01317d..56b5a0b3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2021/6/3 + * @since 2021/6/3 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java index 0751d726..80496eac 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2020/4/25 17:27 + * @since 2020/4/25 17:27 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java index 85b9b690..bf223460 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java @@ -13,7 +13,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java index ead9139f..f5932880 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/LoginTypeDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 登录方式 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java index 88150241..37e153f2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptDto.java @@ -11,7 +11,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java index 497fd10b..a1d5f0ba 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/dept/DeptTreeResult.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/10 15:25 + * @since 2020/5/10 15:25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java index 30830586..c151e7bc 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/permission/PermMenuDto.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java index 5e979e52..90f6d01f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java index da8755a6..d16322a2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/scope/DataScopeUserInfoDto.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户数据范围权限详细信息 * * @author xxm - * @date 2022/1/5 + * @since 2022/1/5 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java index 37da80c9..5edb74db 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/upms/MenuAndResourceDto.java @@ -11,7 +11,7 @@ import java.util.List; * 用户菜单及资源权限返回类 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java index 5cbc6450..0c3e32ec 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/LoginAfterUserInfo.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户登录后所需的基础信息信息 * * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java index 42094afb..dfeca86f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserBaseInfoDto.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java index 754cd366..4c72d402 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserExpandInfoDto.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java index 25cdf2ac..68dba601 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoDto.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; /** * @author xxm - * @date 2020/4/24 + * @since 2020/4/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java index 168a95aa..df07aafd 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserInfoWhole.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java index 2d40be3f..86174d26 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 用户三方绑定信息 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java index 73844b33..575d8c6b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdDto.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/4 + * @since 2021/8/4 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java index 02415273..564ad054 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdInfoDto.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java index 0a912eba..891bb6d6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/login/UserPasswordInvalidException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_PASSWORD_INVALID; * 用户密码不正确异常 * * @author xxm - * @date 2020/5/7 18:16 + * @since 2020/5/7 18:16 */ public class UserPasswordInvalidException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java index 13d2022d..1b8d4dd1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/permission/PermissionDBErrorException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.PERMISSION_DB_ERROR; /** * @author xxm - * @date 2020/5/7 18:01 + * @since 2020/5/7 18:01 */ public class PermissionDBErrorException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java index 2201a47e..38205f92 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyExistedException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_ALREADY_EXISTED; /** * @author xxm - * @date 2020/4/29 14:37 + * @since 2020/4/29 14:37 */ public class RoleAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java index ee86a728..bc7fd89c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleAlreadyUsedException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_ALREADY_USED; /** * @author xxm - * @date 2020/4/29 14:42 + * @since 2020/4/29 14:42 */ public class RoleAlreadyUsedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java index 267620a1..3a4a3122 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/role/RoleNotExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.ROLE_NOT_EXISTED; * 角色不存在 * * @author xxm - * @date 2020/5/7 18:04 + * @since 2020/5/7 18:04 */ public class RoleNotExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java index 3c42079a..dbc23d34 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserInfoNotExistsException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_INFO_NOT_EXISTS; * 用户信息不存在异常 * * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ public class UserInfoNotExistsException extends FatalException { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java index f93f0389..069a7af8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserNonePhoneAndEmailException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.NONE_PHONE_AND_EMAIL; * 用户手机号和邮箱不可都为空的异常 * * @author xxm - * @date 2020/5/7 18:30 + * @since 2020/5/7 18:30 */ public class UserNonePhoneAndEmailException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java index 508056fc..640193aa 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/exception/user/UserPhoneAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.iam.code.IamErrorCode.USER_PHONE_ALREADY_EXISTED * 用户手机已存在异常 * * @author xxm - * @date 2020/5/7 18:25 + * @since 2020/5/7 18:25 */ public class UserPhoneAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java index 913c175d..b76bcb6e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/DataPermScopeHandlerImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 数据权限业务实现 * * @author xxm - * @date 2021/12/22 + * @since 2021/12/22 */ @Slf4j @Service diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java index 97b8ce52..3cdd3bc7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/IgnorePathRouterCheck.java @@ -13,7 +13,7 @@ import java.util.List; * 跳过不启用权限控制的路径 * * @author xxm - * @date 2022/5/27 + * @since 2022/5/27 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java index 4f3a8118..2b5f7b7d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/PermCodeRouterCheck.java @@ -19,7 +19,7 @@ import java.util.Optional; * 权限码方式请求路径拦截 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java index 8ee746c4..c6675cbb 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/SelectFieldPermHandlerImpl.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 数据字段权限业务逻辑实现 * * @author xxm - * @date 2023/1/22 + * @since 2023/1/22 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java index 66b36251..a371e427 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/UserPathRouterCheck.java @@ -16,7 +16,7 @@ import java.util.Optional; * 用户路径路由拦截 * * @author xxm - * @date 2021/12/21 + * @since 2021/12/21 */ @Component @RequiredArgsConstructor diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java index d3dd5d0b..30e83067 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/handler/WsUserAuthServiceImpl.java @@ -12,7 +12,7 @@ import java.util.Optional; * websocket 用户认证接口实现 * * @author xxm - * @date 2022/6/9 + * @since 2022/6/9 */ @Slf4j @Component diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java index 123b68c6..97c1c98b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java @@ -10,7 +10,7 @@ import java.util.List; * 认证应用 * * @author xxm - * @date 2022-06-27 + * @since 2022-06-27 */ @Data @Schema(title = "认证应用") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java index 83108b22..63bf4904 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/LoginTypeParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 认证终端 * * @author xxm - * @date 2021/8/25 + * @since 2021/8/25 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java index e5d574f0..f87f3d2a 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/dept/DeptParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/7 18:29 + * @since 2020/5/7 18:29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java index 772590e9..00666d65 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermMenuParam.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/7/12 + * @since 2021/7/12 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java index 2f9104fc..a7124555 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathBatchEnableParam.java @@ -11,7 +11,7 @@ import java.util.List; * 请求权限批量启停用 * * @author xxm - * @date 2022/6/6 + * @since 2022/6/6 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java index 98cee017..0cbe6738 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/permission/PermPathParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/6/16 + * @since 2021/6/16 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java index fa45b068..f3343d8f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/role/RoleParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/6/17 + * @since 2021/6/17 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java index 17ccf28a..6479128c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeDeptParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java index c9db3337..22117080 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java index 3174acce..86dbce98 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/scope/DataScopeUserParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2021/12/24 + * @since 2021/12/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java index 68319f87..cb24437b 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/RolePermissionParam.java @@ -11,7 +11,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/9 + * @since 2021/6/9 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java index ef0aeaf9..e533c1b2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeBatchParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2022/6/7 + * @since 2022/6/7 */ @Data @Schema(title = "用户数据权限批量设置参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java index bebe2cd2..644b0318 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserDataScopeParam.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; /** * @author xxm - * @date 2022/1/2 + * @since 2022/1/2 */ @Data @Schema(title = "用户数据权限参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java index a02d4e89..00f8b3b3 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleBatchParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:10 + * @since 2020/5/1 18:10 */ @Data @Schema(title = "用户角色参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java index a4e0ba0c..c6c838d9 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/upms/UserRoleParam.java @@ -8,7 +8,7 @@ import java.util.List; /** * @author xxm - * @date 2020/5/1 18:10 + * @since 2020/5/1 18:10 */ @Data @Schema(title = "用户角色参数") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java index 4f622fd5..90a1f00d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBaseInfoParam.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java index bd4cf15e..caac0efe 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserBindThirdParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 用户绑定第三方开放平台参数 * * @author xxm - * @date 2022/7/2 + * @since 2022/7/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java index 96d3bd1a..e9dc676e 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangeEmailParam.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank; * 用户修改邮箱参数 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java index eb006843..0479d318 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserChangePhoneParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 用户修改手机号参数 * * @author xxm - * @date 2022/6/19 + * @since 2022/6/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java index c23dea5d..4c38a032 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptBatchParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java index cdedba84..f5272b2c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserDeptParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/9/29 + * @since 2021/9/29 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java index 84c6d4de..c666b4ce 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserExpandInfoParam.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @author xxm - * @date 2022/1/8 + * @since 2022/1/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java index 03fb6ce4..ae28f4e8 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetEmailParam.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotBlank; * 通过邮件验证码忘记密码参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java index 1dd3d0b1..2e56662d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserForgetPhoneParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 通过手机验证码忘记密码参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java index a2acdfe4..e0dda289 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserInfoParam.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author xxm - * @date 2021/6/2 + * @since 2021/6/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java index 14fa8716..e94833f1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserRegisterParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotBlank; * 注册用户参数 * * @author xxm - * @date 2022/6/26 + * @since 2022/6/26 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java index ae83b4df..20940d04 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/user/UserThirdInfoParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 用户三方登录绑定详情 * * @author xxm - * @date 2022-07-02 + * @since 2022-07-02 */ @Data @Schema(title = "用户三方登录绑定详情") diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java index abb5d9bf..89ee0ab1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/NoticeApplication.java @@ -8,7 +8,7 @@ import org.springframework.context.annotation.ComponentScan; * 通知中心 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @ComponentScan @MapperScan(annotationClass = Mapper.class) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java index b42df65d..36546714 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MailCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 邮箱常量 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ public interface MailCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java index cf147661..331874fd 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 消息模板类型 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ public interface MessageTemplateCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java index 1c19838a..7cabadf0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/NoticeCenterErrorCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 通知中心错误码 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ public interface NoticeCenterErrorCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java index 0c68ceb8..44887d55 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SiteMessageCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.code; * 站内信编码 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ public interface SiteMessageCode { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java index f3247086..8160bd4a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MailConfigController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2020/5/2 14:38 + * @since 2020/5/2 14:38 */ @Tag(name = "邮箱配置") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java index cfe43bdc..91351250 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/MessageTemplateController.java @@ -18,7 +18,7 @@ import java.util.Map; * 消息模板 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Tag(name = "消息模板") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java index 5e16e6bd..3106d874 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; /** * @author xxm - * @date 2021/8/8 + * @since 2021/8/8 */ @Tag(name = "站内信") @RestController diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java index d13db094..e900fc2e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/chat/DingChatNoticeParam.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 企业群消息参数 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java index 32dc74c9..ad83dc65 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeParam.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉企业通知消息父类 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java index 40fa72c1..b2f5b33a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeReceive.java @@ -10,7 +10,7 @@ import java.util.List; * 企业通知接收人配置 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java index 290498bc..78e51a4b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/corp/DingCorpNoticeUpdate.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 企业通知(OA消息)更新 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java index bf60c14c..c5638a13 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingActionCardMsg.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; * 钉钉卡片工作通知消息 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java index 76d58c49..50dca7a7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingFileMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉文件工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java index fa935b63..9d88fcdc 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingImageMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉图片工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java index 837a9c1b..3bcb6bac 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingLinkMsg.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 钉钉链接信息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java index 7096f616..36bc79ec 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMarkDownMsg.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java index a77d85ac..2c85da39 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingMsg.java @@ -6,7 +6,7 @@ import cn.bootx.platform.starter.dingtalk.param.notice.msg.Msg; * 钉钉消息接口 * * @author xxm - * @date 2022/7/20 + * @since 2022/7/20 */ public interface DingMsg { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java index 873f3bbc..24e582f1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingOaMsg.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java index 5f5f5250..c0956a14 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingTextMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 钉钉工作通知消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java index 2aaa6832..860b8df6 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; * 声音消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java index fcdb76fd..f5adfe92 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingRobotNoticeSenderImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * 钉钉机器人消息 * * @author xxm - * @date 2022/7/19 + * @since 2022/7/19 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java index 1b000ba9..692a4246 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/service/DingTalkNoticeSenderImpl.java @@ -28,7 +28,7 @@ import java.util.Objects; * 钉钉消息通知 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java index b971bc1e..6cb7e1e0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/convert/MailConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 钉钉相关类转换 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Mapper public interface MailConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java index 054bfe58..8fa42966 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigManager.java @@ -16,7 +16,7 @@ import java.util.Optional; /** * @author xxm - * @date 2020/4/8 13:27 + * @since 2020/4/8 13:27 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java index 432f2c42..614327ef 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/dao/MailConfigMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 邮件[配置 * * @author xxm - * @date 2020/4/8 13:22 + * @since 2020/4/8 13:22 */ @Mapper public interface MailConfigMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java index 0d5e2681..8f71bc3e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/entity/MailConfig.java @@ -16,7 +16,7 @@ import lombok.experimental.Accessors; * 邮件配置 * * @author xxm - * @date 2020/4/8 11:14 + * @since 2020/4/8 11:14 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java index dc3566a3..9d49534a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/EmailNoticeSenderImpl.java @@ -36,7 +36,7 @@ import java.util.*; * 邮件发送服务 * * @author xxm - * @date 2020/5/2 16:06 + * @since 2020/5/2 16:06 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java index e31394e3..ca7bf74d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/mail/service/MailConfigService.java @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional; * 邮件配置 * * @author xxm - * @date 2020/4/8 13:29 + * @since 2020/4/8 13:29 */ @Service @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java index 89184dd5..6b27d1cf 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/convert/SiteMessageConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 站内信转换 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Mapper public interface SiteMessageConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java index 84fa6108..e2749ce5 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java @@ -23,7 +23,7 @@ import static cn.bootx.platform.notice.code.SiteMessageCode.STATE_SENT; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java index 41605d21..2ce415b4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Mapper public interface SiteMessageMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java index ad0d30f6..3620ed89 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserManager.java @@ -12,7 +12,7 @@ import java.util.Optional; /** * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java index 7d42e33b..b8917594 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageUserMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Mapper public interface SiteMessageUserMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java index c79362c3..5e41cdf1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfo.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 站内信信息详情 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java index 806cb66c..26e909a1 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/domain/SiteMessageInfoMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; * 只用来生成字段缓存 * * @author xxm - * @date 2022/8/14 + * @since 2022/8/14 */ @Mapper public interface SiteMessageInfoMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java index feb247db..7102e541 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessage.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java index 1573cef2..7539feb0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/entity/SiteMessageUser.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 消息用户关联信息 * * @author xxm - * @date 2022/8/13 + * @since 2022/8/13 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java index c3483d21..cc2bea17 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java @@ -39,7 +39,7 @@ import static cn.bootx.platform.notice.code.SiteMessageCode.*; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java index aacead01..63cde288 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/3/28 + * @since 2023/3/28 */ @Mapper public interface SmsChannelConfigMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index 62469e77..ccf0d79a 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; /** * 短信渠道配置 * @author xxm - * @date 2023/3/28 + * @since 2023/3/28 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java index 75bd7afb..cdaf3044 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/convert/MessageTemplateConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; * 消息模板转换 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Mapper public interface MessageTemplateConvert { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java index f879acab..0fb1fb91 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateManager.java @@ -18,7 +18,7 @@ import java.util.Optional; * 消息模板 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java index 1bd5c725..038c07be 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/dao/MessageTemplateMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Mapper public interface MessageTemplateMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java index cfbc66db..609f040c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/service/MessageTemplateService.java @@ -24,7 +24,7 @@ import java.util.Map; * 消息模板 * * @author xxm - * @date 2021/8/9 + * @since 2021/8/9 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java index 426492ce..1a87485e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigManager.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; * 微信消息配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Slf4j @Repository diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java index 88103ba3..57010736 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/dao/WeChatNoticeConfigMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Mapper public interface WeChatNoticeConfigMapper extends BaseMapper { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java index 3ec399f2..972c7cf4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wechat/entity/WeChatNoticeConfig.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 微信消息配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java index 9dc077fc..4466a9a8 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeParam.java @@ -12,7 +12,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; * 企业微信发送消息参数 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java index abfcff26..2dcff412 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/WeComNoticeReceive.java @@ -10,7 +10,7 @@ import java.util.List; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java index 20b0ed7b..41b16ca2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComFileMsg.java @@ -7,7 +7,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java index e431a829..7dbc5189 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComImageMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @NoArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java index 731dfee9..cfd8f6d4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMarkdownMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java index fd3f9b35..27663e7c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMpNewsMsg.java @@ -15,7 +15,7 @@ import java.util.List; * mpnews类型的图文消息，跟普通的图文消息一致，唯一的差异是图文内容存储在企业微信。 多次发送mpnews，会被认为是不同的图文，阅读、点赞的统计会被分开计算。 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java index 29652ffa..7f4a5825 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComMsg.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; * 企业微信通知消息 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ public interface WeComMsg { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java index e29daa1f..b74b443d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComNewsMsg.java @@ -15,7 +15,7 @@ import java.util.List; * 暂未支持 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java index a9bbe438..ddad5674 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComRobotReceive.java @@ -10,7 +10,7 @@ import java.util.List; * 企微机器人接收人配置 * * @author xxm - * @date 2022/7/24 + * @since 2022/7/24 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java index 9e94ed3b..cf5e7295 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextCardMsg.java @@ -7,7 +7,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java index 54d4789a..0bf517c0 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComTextMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java index a03ec2c8..662a419d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVideoMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @NoArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java index a3ead5f7..04d7def4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/entity/msg/WeComVoiceMsg.java @@ -9,7 +9,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpMessage; /** * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Data @AllArgsConstructor diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java index 9b4e952c..0454ec56 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComNoticeSenderImpl.java @@ -16,7 +16,7 @@ import java.io.InputStream; * 实现类 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java index f1163889..ae141917 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/wecom/service/WeComRobotNoticeSenderImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 微信机器人消息发送 * * @author xxm - * @date 2022/7/23 + * @since 2022/7/23 */ @Slf4j @Service diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java index bd0c6f1d..acd5b20b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/BaseMailParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 基础通知参数 * * @author xxm - * @date 2020/5/2 20:32 + * @since 2020/5/2 20:32 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java index c77ead59..61a088ba 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailConfigDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/2 14:42 + * @since 2020/5/2 14:42 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java index 544a008a..92c71590 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/MailFileParam.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 邮件附件参数 * * @author xxm - * @date 2020/5/2 20:33 + * @since 2020/5/2 20:33 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java index aed897a5..9ae79384 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/NoticeReceiverDto.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; * 测试通知接收者管理 * * @author xxm - * @date 2020/5/3 10:56 + * @since 2020/5/3 10:56 */ @EqualsAndHashCode(callSuper = true) @Schema(title = "通知接收者配置dto") diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java index 5abb3f75..b4a16319 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/SendMailParam.java @@ -12,7 +12,7 @@ import java.util.List; * 发邮件的参数 * * @author xxm - * @date 2020/5/2 20:31 + * @since 2020/5/2 20:31 */ @Schema(title = "发邮件的参数") @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java index 367c98ad..0b3a85d2 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/mail/ToUserRequiredMailParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; * touser 必需时使用的参数 * * @author xxm - * @date 2020/5/2 20:32 + * @since 2020/5/2 20:32 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java index 0beb5f83..46b3cdf9 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/site/SiteMessageDto.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; * 站内信 * * @author xxm - * @date 2021/8/7 + * @since 2021/8/7 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java index 1847818c..c0a1af70 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 消息模板 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java index eadfae00..d60fcd49 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/wechat/WeChatNoticeConfigDto.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 微信通知配置 * * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java index 05bd2a96..df47db07 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/CodeTemplateExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CO * 邮箱代码已经存在 * * @author xxm - * @date 2020/6/10 16:21 + * @since 2020/6/10 16:21 */ public class CodeTemplateExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java index 0d67bf4a..4aac9e62 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/DefaultMailConfigAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.DEFAULT_MAIL_C * 默认邮箱配置 已存在异常 * * @author xxm - * @date 2020/5/2 14:43 + * @since 2020/5/2 14:43 */ public class DefaultMailConfigAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java index 02f83f03..10042413 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailConfigCodeAlreadyExistedException.java @@ -10,7 +10,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_CONFIG_CO * 邮箱配置编号 已存在异常 * * @author xxm - * @date 2020/5/2 14:12 + * @since 2020/5/2 14:12 */ public class MailConfigCodeAlreadyExistedException extends BizException implements Serializable { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java index 9f543394..1e58621b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/exception/MailTemplateNotExistException.java @@ -8,7 +8,7 @@ import static cn.bootx.platform.notice.code.NoticeCenterErrorCode.MAIL_TEMPLATE_ * 模板不存在 * * @author xxm - * @date 2020/11/18 + * @since 2020/11/18 */ public class MailTemplateNotExistException extends FatalException { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java index 144b222c..594e8e8b 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailConfigParam.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2020/5/2 14:42 + * @since 2020/5/2 14:42 */ @Data @Schema(title = "邮箱配置 DTO") diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java index 81b2deb1..e2133596 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/mail/MailTemplateParam.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; * 邮件模板 * * @author xxm - * @date 2021/8/5 + * @since 2021/8/5 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java index 1975c4d7..152df426 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/site/SendSiteMessageParam.java @@ -12,7 +12,7 @@ import java.util.List; * 站内信发送参数 * * @author xxm - * @date 2021/8/8 + * @since 2021/8/8 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java index 3722b779..412db126 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java @@ -9,7 +9,7 @@ import java.io.Serializable; /** * @author xxm - * @date 2021/8/10 + * @since 2021/8/10 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java index 50f8ba3a..c8efdb2e 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingRobotNoticeSender.java @@ -8,7 +8,7 @@ import cn.bootx.platform.starter.dingtalk.param.notice.msg.TextMsg; * 钉钉机器人消息通知 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface DingRobotNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java index 22f09aaa..5041b6b9 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/DingTalkNoticeSender.java @@ -10,7 +10,7 @@ import java.io.InputStream; * 钉钉消息通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface DingTalkNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java index 8f34bbf5..49d50ffd 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/EmailNoticeSender.java @@ -6,7 +6,7 @@ import cn.bootx.platform.notice.dto.mail.SendMailParam; * 邮件发送服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface EmailNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java index 498d111d..bddc1765 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/SmsNoticeSender.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.service; * 短信通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface SmsNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java index 164543a3..ccdf917c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeChatNoticeSender.java @@ -4,7 +4,7 @@ package cn.bootx.platform.notice.service; * 微信消息服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeChatNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java index f9e1ffc0..ff028d87 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComNoticeSender.java @@ -9,7 +9,7 @@ import java.io.InputStream; * 企业微信通知服务 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeComNoticeSender { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java index b95307da..acde17ea 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/service/WeComRobotNoticeSender.java @@ -9,7 +9,7 @@ import java.util.List; * 企业微信机器人配置 * * @author xxm - * @date 2022/7/16 + * @since 2022/7/16 */ public interface WeComRobotNoticeSender { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java index bc726956..50908aed 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/VisualizationApplication.java @@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan; * 可视化模块 * * @author xxm - * @date 2023/2/16 + * @since 2023/2/16 */ @ComponentScan @ConfigurationPropertiesScan diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java index 88d1a6de..e8f99aa9 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/code/GoVIewCode.java @@ -4,7 +4,7 @@ package cn.bootx.platform.visualization.code; * GoVIew大屏相关常量 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ public interface GoVIewCode { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java index b7d98cb6..2669b849 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/configuration/VisualizationProperties.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author xxm - * @date 2023/3/2 + * @since 2023/3/2 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java index 7af40cdd..5ead437b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewAdminController.java @@ -22,7 +22,7 @@ import javax.validation.Valid; * GoView可视化大屏管理接口 * * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Validated @Tag(name = "GoView可视化大屏管理接口") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java index 666ab8d1..5970b512 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/controller/GoViewController.java @@ -20,7 +20,7 @@ import java.util.List; * GoView可视化大屏对接接口 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Validated @Tag(name = "GoView可视化大屏对接接口") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java index 7e37f267..10439a2b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/convert/GoViewConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; * 转换 * * @author xxm - * @date 2023/3/2 + * @since 2023/3/2 */ @Mapper public interface GoViewConvert { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java index b1da2a8b..f213fc15 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoManager.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Repository public class ProjectInfoManager extends BaseManager { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java index 2a7eab05..b9d96cff 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Mapper public interface ProjectInfoMapper extends BaseMapper { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java index bd83240f..66d2a911 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishManager.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; /** * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Repository public class ProjectInfoPublishManager extends BaseManager { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java index 81f0f371..8c8188c3 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/dao/ProjectInfoPublishMapper.java @@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @Mapper public interface ProjectInfoPublishMapper extends BaseMapper { diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java index 862c4283..1ead7718 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfo.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; * 自定义大屏信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java index 14eb6d30..616c9c12 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/entity/ProjectInfoPublish.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; * 自定义大屏编辑时缓存信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java index b2dfe7d5..b4483ecf 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; * 自定义大屏数据接口 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Slf4j @Service diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java index 198d2874..76149afc 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/GoVIewPageResult.java @@ -9,7 +9,7 @@ import lombok.ToString; * GoView分页 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Getter @Setter diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java index c31f7a3e..02bfcc02 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/OssInfo.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 文件上传oss信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java index bedd1d04..cf922548 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoDto.java @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * 项目大屏信息 * * @author xxm - * @date 2023/2/24 + * @since 2023/2/24 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java index 981a45f6..2e5a825b 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/dto/ProjectInfoResult.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 项目大屏信息 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java index 9ba292fa..1a53e7e2 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/login/GoViewLoginAuthentication.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** * @author xxm - * @date 2023/2/16 + * @since 2023/2/16 */ @Slf4j @Component diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java index d046488a..c8b986dd 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/CreateParam.java @@ -7,7 +7,7 @@ import lombok.Data; * GoView项目创建参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Schema(description = "GoView项目创建参数") diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java index ac4bd49f..229d2a62 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoParam.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; /** * @author xxm - * @date 2023/3/3 + * @since 2023/3/3 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java index c3e7209d..2fc46f8a 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/ProjectInfoSave.java @@ -10,7 +10,7 @@ import java.util.Map; * 大屏更新参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java index d650e4e3..8378e507 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/param/PublishParam.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 发布/取消发布参数 * * @author xxm - * @date 2023/2/21 + * @since 2023/2/21 */ @Data @Accessors(chain = true) diff --git a/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java index 356ce117..fba1f97f 100644 --- a/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java +++ b/bootx-start/src/main/java/cn/bootx/platform/start/BootxApplication.java @@ -14,7 +14,7 @@ import java.net.UnknownHostException; * 启动类 * * @author xxm - * @date 2021/7/27 + * @since 2021/7/27 */ @Slf4j @SpringBootApplication -- Gitee From 5748ebf72b45564dd45155d801b73619c11f8c59 Mon Sep 17 00:00:00 2001 From: Fnckerpoi <38403438+Fnckerpoi@users.noreply.github.com> Date: Sun, 9 Jul 2023 08:19:34 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化所在部门及以下部门的权限判断 --- .../iam/core/upms/service/UserDataScopeService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java index ed02f427..8a057d40 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserDataScopeService.java @@ -186,17 +186,17 @@ public class UserDataScopeService { .collect(Collectors.toMap(MpIdEntity::getId, Function.identity())); Set deptOrgCodes = deptIds.stream().map(deptMap::get).map(Dept::getOrgCode).collect(Collectors.toSet()); return deptMap.values() - .stream() - .filter(dept -> this.judgeSubDept(dept.getOrgCode(), deptOrgCodes)) - .map(MpIdEntity::getId) - .collect(Collectors.toSet()); + .stream() + .filter(dept -> this.judgeSubDept(dept.getOrgCode(), deptOrgCodes)) + .map(MpIdEntity::getId) + .collect(Collectors.toSet()); } /** * 判断是否是子部门 */ private boolean judgeSubDept(String orgCode, Set orgCodes) { - return orgCodes.stream().anyMatch(s -> StrUtil.startWith(s, orgCode)); + return orgCodes.stream().anyMatch(s -> StrUtil.startWith(orgCode,s) && orgCode.length()>=s.length()); } } -- Gitee From 10fca9fefa2596464bf94e24c275e6d76d83f169 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Mon, 10 Jul 2023 15:36:06 +0800 Subject: [PATCH 05/35] =?UTF-8?q?build=20=E9=83=A8=E7=BD=B2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96,=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 5 +++-- README.md | 6 +++--- _doc/ChangeLog.md | 4 ++++ bootx-common-core/pom.xml | 2 +- .../common-starter-audit-log/pom.xml | 2 +- bootx-common-starters/common-starter-auth/pom.xml | 2 +- .../common-starter-code-gen/pom.xml | 2 +- .../common-starter-data-perm/pom.xml | 2 +- .../common-starter-dingtalk/pom.xml | 2 +- bootx-common-starters/common-starter-file/pom.xml | 2 +- bootx-common-starters/common-starter-monitor/pom.xml | 2 +- bootx-common-starters/common-starter-quartz/pom.xml | 2 +- bootx-common-starters/common-starter-wechat/pom.xml | 2 +- bootx-common-starters/common-starter-wecom/pom.xml | 2 +- bootx-common-starters/pom.xml | 2 +- bootx-commons/common-cache/pom.xml | 2 +- bootx-commons/common-data-translate/pom.xml | 2 +- bootx-commons/common-exception-handler/pom.xml | 2 +- bootx-commons/common-header-holder/pom.xml | 2 +- bootx-commons/common-idempotency/pom.xml | 2 +- bootx-commons/common-jackson/pom.xml | 2 +- bootx-commons/common-log/pom.xml | 2 +- bootx-commons/common-mongo/pom.xml | 2 +- bootx-commons/common-mybatis-plus/pom.xml | 2 +- bootx-commons/common-rabbitmq/pom.xml | 2 +- bootx-commons/common-redis-client/pom.xml | 2 +- bootx-commons/common-sequence/pom.xml | 2 +- bootx-commons/common-spring/pom.xml | 2 +- bootx-commons/common-super-query/pom.xml | 2 +- bootx-commons/common-swagger/pom.xml | 2 +- bootx-commons/common-websocket/pom.xml | 2 +- bootx-commons/common-xxl-job/pom.xml | 2 +- bootx-commons/pom.xml | 2 +- bootx-demo/pom.xml | 2 +- bootx-services/pom.xml | 2 +- bootx-services/service-baseapi/pom.xml | 2 +- bootx-services/service-iam/pom.xml | 2 +- bootx-services/service-notice/pom.xml | 2 +- bootx-services/service-visualization/pom.xml | 2 +- bootx-start/pom.xml | 2 +- bootx-start/src/main/resources/application-dev.yml | 2 +- bootx-start/src/main/resources/logback-spring.xml | 12 ++++++++++++ docker-compose.yml | 9 ++++----- pom.xml | 4 ++-- 44 files changed, 66 insertions(+), 50 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02562f42..c3fc9196 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ MAINTAINER xxm1995@outlook.com ENV TZ=Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器 -ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom" +# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器, 同时读取外置日志配置 +ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom --Dlogging.config=./logback-spring.xml" # 工作目录 WORKDIR / @@ -22,3 +22,4 @@ ADD bootx-start/target/bootx-start.jar bootx-start.jar # 执行启动命令 CMD java $JAVA_OPTS -jar bootx-start.jar + diff --git a/README.md b/README.md index a2ef91a3..000550cd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Bootx-Platform (v1.3.1-园博园) +# Bootx-Platform (v1.3.2-园博园)

star - Build Status + Build Status Build Status - Downloads + Downloads

diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 36aa8b95..563a4ad6 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,8 @@ # CHANGELOG +## [v1.3.2] 一号线-园博园 +- 新增: 查询生成器支持排序 +- 优化: 版本依赖升级 +- fix: 多数据源加载时机不对, 与flyway冲突 ## [v1.3.1] 一号线-园博园 - 新增: 代码生成器支持多数据源 - 新增: 多数据源增加启动时自动加载配置 diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml index 95059d54..78ea19c0 100644 --- a/bootx-common-core/pom.xml +++ b/bootx-common-core/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml index 5397f6ea..643c34f6 100644 --- a/bootx-common-starters/common-starter-audit-log/pom.xml +++ b/bootx-common-starters/common-starter-audit-log/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml index 09b1ebad..d91bec7d 100644 --- a/bootx-common-starters/common-starter-auth/pom.xml +++ b/bootx-common-starters/common-starter-auth/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.2 4.0.0 common-starter-auth diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml index e1769a16..a9e1a649 100644 --- a/bootx-common-starters/common-starter-code-gen/pom.xml +++ b/bootx-common-starters/common-starter-code-gen/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml index 60e964eb..90b22b16 100644 --- a/bootx-common-starters/common-starter-data-perm/pom.xml +++ b/bootx-common-starters/common-starter-data-perm/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml index 0119bbf3..250324b8 100644 --- a/bootx-common-starters/common-starter-dingtalk/pom.xml +++ b/bootx-common-starters/common-starter-dingtalk/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index 09f2f3d7..6ce9cfdc 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml index ea9c3e0e..01e2a070 100644 --- a/bootx-common-starters/common-starter-monitor/pom.xml +++ b/bootx-common-starters/common-starter-monitor/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 jar diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml index 643b5a5e..f996f1be 100644 --- a/bootx-common-starters/common-starter-quartz/pom.xml +++ b/bootx-common-starters/common-starter-quartz/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml index 23b43cec..bcc1372c 100644 --- a/bootx-common-starters/common-starter-wechat/pom.xml +++ b/bootx-common-starters/common-starter-wechat/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml index 5eebd87d..ebbbbc3c 100644 --- a/bootx-common-starters/common-starter-wecom/pom.xml +++ b/bootx-common-starters/common-starter-wecom/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.1 + 1.3.2 4.0.0 jar diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml index e86a0914..152c46eb 100644 --- a/bootx-common-starters/pom.xml +++ b/bootx-common-starters/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml index 055d49a1..60c85033 100644 --- a/bootx-commons/common-cache/pom.xml +++ b/bootx-commons/common-cache/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml index bc1b0005..ab171b8c 100644 --- a/bootx-commons/common-data-translate/pom.xml +++ b/bootx-commons/common-data-translate/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml index 8d8c670c..ea589798 100644 --- a/bootx-commons/common-exception-handler/pom.xml +++ b/bootx-commons/common-exception-handler/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 common-exception-handler diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml index 97143b77..46efb91f 100644 --- a/bootx-commons/common-header-holder/pom.xml +++ b/bootx-commons/common-header-holder/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml index e4a6dc20..1c730d41 100644 --- a/bootx-commons/common-idempotency/pom.xml +++ b/bootx-commons/common-idempotency/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml index 2669c223..053b6dbf 100644 --- a/bootx-commons/common-jackson/pom.xml +++ b/bootx-commons/common-jackson/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml index f2bfc0be..9a739f5b 100644 --- a/bootx-commons/common-log/pom.xml +++ b/bootx-commons/common-log/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml index 8d71312b..3c11673e 100644 --- a/bootx-commons/common-mongo/pom.xml +++ b/bootx-commons/common-mongo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.1 + 1.3.2 4.0.0 common-mongo diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml index b537d380..2b526346 100644 --- a/bootx-commons/common-mybatis-plus/pom.xml +++ b/bootx-commons/common-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml index e7101dad..8387765b 100644 --- a/bootx-commons/common-rabbitmq/pom.xml +++ b/bootx-commons/common-rabbitmq/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml index f19b6ef5..2771c6bd 100644 --- a/bootx-commons/common-redis-client/pom.xml +++ b/bootx-commons/common-redis-client/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml index 61434845..2fa5b4a1 100644 --- a/bootx-commons/common-sequence/pom.xml +++ b/bootx-commons/common-sequence/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml index 66ad0444..0d37ae06 100644 --- a/bootx-commons/common-spring/pom.xml +++ b/bootx-commons/common-spring/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml index 168c30a9..0c65c37c 100644 --- a/bootx-commons/common-super-query/pom.xml +++ b/bootx-commons/common-super-query/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml index 22529e79..a9bd97ca 100644 --- a/bootx-commons/common-swagger/pom.xml +++ b/bootx-commons/common-swagger/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml index 1aa01f6a..65089d67 100644 --- a/bootx-commons/common-websocket/pom.xml +++ b/bootx-commons/common-websocket/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml index 44d30301..d3e124af 100644 --- a/bootx-commons/common-xxl-job/pom.xml +++ b/bootx-commons/common-xxl-job/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index 51bc3b2f..6e3bd3d3 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -7,7 +7,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 bootx-commons diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index 68720a2d..e81bd2da 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 3eff6ee2..94327117 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml index 248c2e1a..e3c49b99 100644 --- a/bootx-services/service-baseapi/pom.xml +++ b/bootx-services/service-baseapi/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 0c27af07..1f939f03 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 2d48973c..6ebedc26 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -5,7 +5,7 @@ bootx-services cn.bootx.platform - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml index 0483d833..094c5d58 100644 --- a/bootx-services/service-visualization/pom.xml +++ b/bootx-services/service-visualization/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.1 + 1.3.2 4.0.0 diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index 99efe995..d8438a04 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.1 + 1.3.2 4.0.0 bootx-start diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index ddd19a19..877521a2 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -91,7 +91,7 @@ bootx: swagger: enabled: true author: bootx - version: 1.3.1 + version: 1.3.2 title: bootx开发平台单体版 description: bootx-platform开发平台单体版 # basic认证 diff --git a/bootx-start/src/main/resources/logback-spring.xml b/bootx-start/src/main/resources/logback-spring.xml index c1a67868..a7b2caa0 100644 --- a/bootx-start/src/main/resources/logback-spring.xml +++ b/bootx-start/src/main/resources/logback-spring.xml @@ -1,5 +1,10 @@ + + @@ -12,6 +17,13 @@ + + + ${appname} + 127.0.0.1 + + + diff --git a/docker-compose.yml b/docker-compose.yml index 917015df..41e894c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,7 @@ services: ports: - "8080:8080" volumes: - # 宿主机目录:容器目录 日志映射 - - /data/logs/bootx-platform:/logs - # 外部化配置文件 - - ./application.yml:/application.yml - - ./logback-spring.xml:/logback-spring.xml + # 读取外部化配置文件(根据实际服务器环境做修改), 宿主机目录:容器目录 + - /data/logs/dax-start:/logs # 日志 + - /root/dax-pay/application-dev.yml:/application-dev.yml # 配置 + - /root/dax-pay/logback-spring.xml:/logback-spring.xml # 日志框架 diff --git a/pom.xml b/pom.xml index 58d9dcbc..936c72c8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cn.bootx.platform bootx-platform-parent pom - 1.3.1 + 1.3.2 bootx-platform @@ -83,7 +83,7 @@ 1.8 - 1.3.1 + 1.3.2 5.8.18 6.4.0 -- Gitee From f5e9911d4c5ec4d839ffdd98ac133270e820dbc4 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Mon, 10 Jul 2023 16:02:46 +0800 Subject: [PATCH 06/35] =?UTF-8?q?build=20=E9=83=A8=E7=BD=B2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96,=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c3fc9196..fd72312e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV TZ=Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器, 同时读取外置日志配置 -ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom --Dlogging.config=./logback-spring.xml" +ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -Dlogging.config=./logback-spring.xml" # 工作目录 WORKDIR / -- Gitee From 68aa67480c2461e501b9ed8c349ff71da1a46771 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Wed, 12 Jul 2023 17:24:05 +0800 Subject: [PATCH 07/35] =?UTF-8?q?build=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redisson/RedissonClientTemporary.java | 8 +++---- pom.xml | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java index fbb77973..dbf8354d 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/redisson/RedissonClientTemporary.java @@ -155,13 +155,13 @@ public class RedissonClientTemporary implements RedissonClient { /** * @param s * @param codec - * @param mapOptions + * @param mapCacheOptions * @param * @param * @return */ @Override - public RMapCache getMapCache(String s, Codec codec, MapOptions mapOptions) { + public RMapCache getMapCache(String s, Codec codec, MapCacheOptions mapCacheOptions) { return null; } @@ -178,13 +178,13 @@ public class RedissonClientTemporary implements RedissonClient { /** * @param s - * @param mapOptions + * @param mapCacheOptions * @param * @param * @return */ @Override - public RMapCache getMapCache(String s, MapOptions mapOptions) { + public RMapCache getMapCache(String s, MapCacheOptions mapCacheOptions) { return null; } diff --git a/pom.xml b/pom.xml index 936c72c8..428defad 100644 --- a/pom.xml +++ b/pom.xml @@ -85,46 +85,46 @@ 1.3.2 - 5.8.18 - 6.4.0 + 5.8.20 + 6.4.4 2.12.3 3.11 4.4 1.10.0 2.11.0 - 31.1-jre + 32.1.1-jre 4.0.1 0.0.38 1.7.30 - 2.14.2 + 2.14.3 7.15.0 1.4.01 1.2.12 3.5.3 - 3.2.1 + 3.3.2 2.4.0 2.9.7 1.34.0 1.16.5 - 8.5.2 + 8.5.4 3.5.3.1 3.6.1 1.6.15 - 3.21.1 - 4.0.0 - 1.5.3.Final + 3.23.0 + 4.1.0 + 1.5.5.Final 0.2.0 1.6.2 - 7.3 + 7.4 1.2.83_noneautotype 0.41 V1.4-SNAPSHOT 2.3 - 4.4.9.B + 4.5.2.B 1.3.81 - 2.2.4 + 2.2.5 2.7.0 1.5.3 -- Gitee From 12765239eb385e1b7487e5dff1a1a960a260db73 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 21 Jul 2023 14:01:10 +0800 Subject: [PATCH 08/35] =?UTF-8?q?fix=20JacksonUtil=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- README.md | 16 +++++----------- _doc/Task.md | 8 ++++++++ .../common/jackson/util/JacksonUtil.java | 2 ++ 4 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 _doc/Task.md diff --git a/Dockerfile b/Dockerfile index fd72312e..e34a3706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # java8基础镜像 -FROM openjdk:8-jre +FROM registry.cn-beijing.aliyuncs.com/xxm1995/java8 # 作者信息 MAINTAINER xxm1995@outlook.com diff --git a/README.md b/README.md index 000550cd..decf8f9f 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,12 @@ - 可视化大屏使用 [Go-VIew](https://gitee.com/dromara/go-view) 作为基础框架 - 移动端使用 [Taro](https://taro.jd.com/)、[NutUI](https://nutui.jd.com/) vue3+TS为技术栈。 -## 🍁子项目 +## 🍁 Bootx 项目合集 +- Bootx-Platform：单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) +- Bootx-Cloud：微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) - dax-pay：开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) -- bpm-plus：工作流办公平台[Gitee地址](https://gitee.com/bootx/bpm-plus) +- bpm-plus：开源支付系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) - mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) -- 待命名：可视化大屏 ## 项目Maven坐标 > 项目各模块都已经发布到maven中央仓库中，进行二开时可以对不进行更改的模块，使用Maven方式进行引入，方便后续进行版本升级 @@ -46,7 +47,7 @@ - 系统演示地址：[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/) - 前端项目地址：[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization)、[前端项目(vue2只维护不再更新)](https://gitee.com/bootx/bootx-platform-ui) - 移动端项目地址：[移动端项目(taro+vue3+ts)](https://gitee.com/xucun/bootx-platform-mobile) -- 日志收集：[[PlumeLog](http://platform.dev.bootx.cn:8080/plumelog/#/) +- 日志收集：[PlumeLog](http://139.198.29.219:8891/) - 项目文档：[项目文档(GITEE)](https://bootx.gitee.io/)、[项目文档(备用)](https://doc.bootx.cn/) - 更新日志：[更新日志](./_doc/ChangeLog.md) @@ -127,13 +128,6 @@ bootx-platform ├── bootx-start -- 启动模块 ``` -## 🥂 Bootx 项目合集 -- Bootx-Platform：单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) -- Bootx-Cloud：微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) -- dax-pay：开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) -- bpm-plus：开源支付系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) -- mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) - ## 🥪 关于我们 QQ扫码加入QQ交流群 diff --git a/_doc/Task.md b/_doc/Task.md new file mode 100644 index 00000000..2e157614 --- /dev/null +++ b/_doc/Task.md @@ -0,0 +1,8 @@ +- 添加各种导入和导出功能 + - 用户 + - 角色 +- 添加各种批量操作功能 +- 添加配置备份功能 + - 菜单 + - 系统参数 + - 字典 diff --git a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java index 35322e08..39e73b3b 100644 --- a/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java +++ b/bootx-commons/common-jackson/src/main/java/cn/bootx/platform/common/jackson/util/JacksonUtil.java @@ -29,6 +29,7 @@ public class JacksonUtil { if (objectMapperFlag) { throw new RepetitiveOperationException(); } + objectMapperFlag = true; JacksonUtil.objectMapper = objectMapper; } @@ -36,6 +37,7 @@ public class JacksonUtil { if (typeObjectMapperFlag) { throw new RepetitiveOperationException(); } + typeObjectMapperFlag = true; JacksonUtil.typeObjectMapper = typeObjectMapper; } -- Gitee From 1a27fccf8b9e615e2ae1e6e71337921177623c76 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 28 Jul 2023 17:08:46 +0800 Subject: [PATCH 09/35] =?UTF-8?q?feat=20=E4=BA=8B=E4=BB=B6=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 15 +++++++++++---- bootx-commons/common-eventer/pom.xml | 16 ++++++++++++++++ .../common/event/EventAutoConfiguration.java | 16 ++++++++++++++++ .../common/event/code/EventTyoeEnum.java | 9 +++++++++ .../common/event/domain/AbsBaseEvent.java | 9 +++++++++ ....boot.autoconfigure.AutoConfiguration.imports | 1 + .../configuration/RedisAutoConfiguration.java | 3 --- bootx-commons/pom.xml | 1 + 8 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 bootx-commons/common-eventer/pom.xml create mode 100644 bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java create mode 100644 bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java create mode 100644 bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java create mode 100644 bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/_doc/Task.md b/_doc/Task.md index 2e157614..fdce847e 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,8 +1,15 @@ -- 添加各种导入和导出功能 - - 用户 - - 角色 -- 添加各种批量操作功能 +1.3.3 +- 添加各种事件 + - 用户相关 + - 新增 + - 修改 + - 删除 + - - 添加配置备份功能 - 菜单 - 系统参数 - 字典 +- 添加各种导入和导出功能 + - 用户 + - 角色 +- 添加各种批量操作功能 diff --git a/bootx-commons/common-eventer/pom.xml b/bootx-commons/common-eventer/pom.xml new file mode 100644 index 00000000..bdb69f8b --- /dev/null +++ b/bootx-commons/common-eventer/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + cn.bootx.platform + bootx-commons + 1.3.2 + + + common-eventer + jar + + + diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java new file mode 100644 index 00000000..6011e04f --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/EventAutoConfiguration.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.common.event; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.context.annotation.ComponentScan; + +/** + * 简单事件通知封装 + * @author xxm + * @since 2023/7/28 + */ +@ComponentScan +@ConfigurationPropertiesScan +@AutoConfiguration +public class EventAutoConfiguration { +} diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java new file mode 100644 index 00000000..18e37555 --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/code/EventTyoeEnum.java @@ -0,0 +1,9 @@ +package cn.bootx.platform.common.event.code; + +/** + * 事件消息类型 + * @author xxm + * @since 2023/7/28 + */ +public enum EventTyoeEnum { +} diff --git a/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java new file mode 100644 index 00000000..da88feb3 --- /dev/null +++ b/bootx-commons/common-eventer/src/main/java/cn/bootx/platform/common/event/domain/AbsBaseEvent.java @@ -0,0 +1,9 @@ +package cn.bootx.platform.common.event.domain; + +/** + * 抽象基础时间对象定义 + * @author xxm + * @since 2023/7/28 + */ +public class AbsBaseEvent { +} diff --git a/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..ed92b4cc --- /dev/null +++ b/bootx-commons/common-eventer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.bootx.platform.common.event.EventAutoConfiguration diff --git a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java index 9c77c4a8..a8abd070 100644 --- a/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java +++ b/bootx-commons/common-redis-client/src/main/java/cn/bootx/platform/common/redis/configuration/RedisAutoConfiguration.java @@ -43,8 +43,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class RedisAutoConfiguration { - private final ObjectMapper objectMapper; - /** * 默认 RedisClient */ @@ -58,7 +56,6 @@ public class RedisAutoConfiguration { /** * 默认 RedisTemplate */ - @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") @Bean @Primary public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory, diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index 6e3bd3d3..8fb95c18 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -31,6 +31,7 @@ common-websocket common-rabbitmq common-data-translate + common-eventer -- Gitee From a8fe13d30c2fd15695845d7ced7f47551f743255 Mon Sep 17 00:00:00 2001 From: xxm Date: Sat, 29 Jul 2023 16:54:21 +0800 Subject: [PATCH 10/35] =?UTF-8?q?feat=20=E6=93=8D=E4=BD=9C=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 8 +++--- .../core/user/service/UserAdminService.java | 2 +- .../event => event/user}/UserCreateEvent.java | 2 +- .../iam/event/user/UserLockEvent.java | 28 +++++++++++++++++++ 4 files changed, 34 insertions(+), 6 deletions(-) rename bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/{core/user/event => event/user}/UserCreateEvent.java (90%) create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java diff --git a/_doc/Task.md b/_doc/Task.md index fdce847e..acaa1531 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,9 +1,9 @@ 1.3.3 -- 添加各种事件 +- 添加各种事件(Spring事件) - 用户相关 - - 新增 - - 修改 - - 删除 + - 新增 + - 修改 + - 删除 - - 添加配置备份功能 - 菜单 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java index 644660e0..7d923490 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java @@ -17,7 +17,7 @@ import cn.bootx.platform.iam.core.user.dao.UserExpandInfoManager; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; import cn.bootx.platform.iam.core.user.entity.UserInfo; -import cn.bootx.platform.iam.core.user.event.UserCreateEvent; +import cn.bootx.platform.iam.event.user.UserCreateEvent; import cn.bootx.platform.iam.dto.dept.DeptDto; import cn.bootx.platform.iam.dto.role.RoleDto; import cn.bootx.platform.iam.dto.user.UserInfoDto; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java similarity index 90% rename from bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java index b09d3833..a5e39c10 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/event/UserCreateEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.iam.core.user.event; +package cn.bootx.platform.iam.event.user; import cn.bootx.platform.iam.dto.user.UserInfoDto; import lombok.Getter; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java new file mode 100644 index 00000000..c72825fd --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java @@ -0,0 +1,28 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 锁定用户 + * @author xxm + * @since 2023/7/29 + */ +@Getter +public class UserLockEvent extends ApplicationEvent { + + private final List userIds; + + public UserLockEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } +} -- Gitee From fb982695eb0e5e6b885b9662f0bf936f3be77cc2 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Wed, 2 Aug 2023 18:07:11 +0800 Subject: [PATCH 11/35] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E4=BA=8B=E4=BB=B6,=20=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +- _doc/ChangeLog.md | 2 + _doc/Task.md | 25 ++-- .../log/plumelog/PlumeLogAutoDeleteLogs.java | 130 +++++++++--------- bootx-services/pom.xml | 3 + .../iam/controller/RoleController.java | 6 +- .../iam/core/client/dao/ClientManager.java | 8 ++ .../iam/core/client/entity/Client.java | 7 + .../iam/core/role/service/RoleService.java | 19 ++- .../iam/core/user/dao/UserInfoManager.java | 22 ++- .../core/user/service/UserAdminService.java | 48 ++++--- .../core/user/service/UserInfoService.java | 21 ++- .../platform/iam/dto/client/ClientDto.java | 3 + .../iam/event/role/RoleCreateEvent.java | 19 +++ .../iam/event/role/RoleDeleteEvent.java | 32 +++++ .../iam/event/role/RoleUpdateEvent.java | 19 +++ .../event/user/UserChangePasswordEvent.java | 32 +++++ .../iam/event/user/UserCreateEvent.java | 1 - .../iam/event/user/UserDeleteEvent.java | 32 +++++ .../iam/event/user/UserLockEvent.java | 4 + .../event/user/UserRestartPasswordEvent.java | 31 +++++ .../iam/event/user/UserUnlockEvent.java | 32 +++++ .../iam/event/user/UserUpdateEvent.java | 21 +++ .../iam/param/client/ClientParam.java | 3 + bootx-services/service-miniapp/pom.xml | 53 +++++++ .../platform/miniapp/MiniAppApplication.java | 15 ++ .../controller/UserProtocolController.java | 67 +++++++++ .../protocol/convert/UserProtocolConvert.java | 22 +++ .../protocol/dao/UserProtocolManager.java | 35 +++++ .../core/protocol/dao/UserProtocolMapper.java | 14 ++ .../core/protocol/entity/UserProtocol.java | 48 +++++++ .../protocol/service/UserProtocolService.java | 76 ++++++++++ .../miniapp/dto/protocol/UserProtocolDto.java | 27 ++++ .../param/protocol/UserProtocolParam.java | 26 ++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + bootx-start/pom.xml | 8 +- .../src/main/resources/application-dev.yml | 4 +- pom.xml | 2 +- 38 files changed, 807 insertions(+), 118 deletions(-) create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java create mode 100644 bootx-services/service-miniapp/pom.xml create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java create mode 100644 bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/README.md b/README.md index decf8f9f..ba6f284e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ - Bootx-Platform：单体版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-platform) - Bootx-Cloud：微服务版脚手架 [Gitee地址](https://gitee.com/bootx/bootx-cloud) - dax-pay：开源支付系统 [Gitee地址](https://gitee.com/bootx/dax-pay) -- bpm-plus：开源支付系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) +- bpm-plus：协同办公系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) - mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) ## 项目Maven坐标 @@ -77,12 +77,8 @@ Spring Boot后端: [后端启动流程](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) -Vue2前端: [Vue2前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备) - Vue3后端: [Vue3前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备-1) -可视化大屏: [可视化大屏启动流程](https://bootx.gitee.io/doc/overview/) - ## 🥞项目模块结构 ```lua bootx-platform @@ -123,6 +119,7 @@ bootx-platform ├── bootx-services -- 业务服务模块 ├── service-baseapi -- 基础api功能服务 ├── service-iam -- 身份识别与访问管理 + ├── service-miniapp -- 小程序服务 ├── service-notice -- 消息通知服务 ├── service-visualization -- 可视化大屏管理 ├── bootx-start -- 启动模块 diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 563a4ad6..c3af0c1b 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,6 @@ # CHANGELOG +## [v1.3.3] 一号线-园博园 + ## [v1.3.2] 一号线-园博园 - 新增: 查询生成器支持排序 - 优化: 版本依赖升级 diff --git a/_doc/Task.md b/_doc/Task.md index acaa1531..1515b48f 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,15 +1,14 @@ -1.3.3 -- 添加各种事件(Spring事件) - - 用户相关 - - 新增 - - 修改 - - 删除 - - -- 添加配置备份功能 - - 菜单 - - 系统参数 - - 字典 +## 1.3.3 +- x 终端可以设置新注册用户是否默认拥有该终端的权限 +- 添加各种事件 + - x 用户相关 + - 角色相关 +- 添加配置备份功能(菜单/系统参数/字典) - 添加各种导入和导出功能 - - 用户 - - 角色 - 添加各种批量操作功能 +- 一键缓存同步和更新操作(字典/参数) +- vxe暗黑模式适配 +- MiniApp添加用户协议/隐私协议等 + +1.3.x +- PostgreSQL 数据库适配 diff --git a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java index db8ad73d..44c3516c 100644 --- a/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java +++ b/bootx-commons/common-log/src/main/java/cn/bootx/platform/common/log/plumelog/PlumeLogAutoDeleteLogs.java @@ -1,65 +1,65 @@ -package cn.bootx.platform.common.log.plumelog; - -import cn.bootx.platform.common.log.configuration.LogProperties; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; -import com.plumelog.lite.client.IndexUtil; -import com.plumelog.lite.client.InitConfig; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.io.File; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -/** - * PlumeLog日志删除定时任务的重新实现, 原有的日志清除逻辑是基于Lucene实现的, 文件夹将会残留, 同时还会创建出每个小时的新文件夹 - * @author xxm - * @since 2023/3/29 - */ -@Component -@ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") -@RequiredArgsConstructor -public class PlumeLogAutoDeleteLogs { - private final LogProperties logProperties; - /** - * 自动删除日志，凌晨0点执行 - */ - @Scheduled(cron = "0 0 0 * * ?") - public void task(){ - LogProperties.PlumeLog plumeLog = logProperties.getPlumeLog(); - if (plumeLog.getKeepDays()<=0){ - return; - } - // 生成不需要删除的日志文件夹名称序列 - Set logDirSeq = IntStream.rangeClosed(0, plumeLog.getKeepDays()) - .mapToObj(i -> IndexUtil.getRunLogIndex(System.currentTimeMillis() - i * InitConfig.MILLS_ONE_DAY)) - .collect(Collectors.toSet()); - - // 每天的日志文件夹进行清理 - File dir = new File(InitConfig.LITE_MODE_LOG_PATH + "/data"); - if (dir.isDirectory()) { - File[] files = dir.listFiles(); - if (Objects.isNull(files)){ - return; - } - for (File file : files) { - // 如果不是日志文件夹, 继续向下执行 - if (!StrUtil.startWith(file.getName(),"")){ - continue; - } - // 如果属于不需要删除的日志, 继续向下执行 - if (logDirSeq.contains(file.getName())){ - continue; - } - // 删除过时的日志文件夹 - FileUtil.del(file); - } - } - } - -} +//package cn.bootx.platform.common.log.plumelog; +// +//import cn.bootx.platform.common.log.configuration.LogProperties; +//import cn.hutool.core.io.FileUtil; +//import cn.hutool.core.util.StrUtil; +//import com.plumelog.lite.client.IndexUtil; +//import com.plumelog.lite.client.InitConfig; +//import lombok.RequiredArgsConstructor; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +//import org.springframework.scheduling.annotation.Scheduled; +//import org.springframework.stereotype.Component; +// +//import java.io.File; +//import java.util.Objects; +//import java.util.Set; +//import java.util.stream.Collectors; +//import java.util.stream.IntStream; +// +///** +// * PlumeLog日志删除定时任务的重新实现, 原有的日志清除逻辑是基于Lucene实现的, 文件夹将会残留, 同时还会创建出每个小时的新文件夹 +// * @author xxm +// * @since 2023/3/29 +// */ +//@Component +//@ConditionalOnClass(name = "com.plumelog.lite.client.InitConfig") +//@RequiredArgsConstructor +//public class PlumeLogAutoDeleteLogs { +// private final LogProperties logProperties; +// /** +// * 自动删除日志，凌晨0点执行 +// */ +// @Scheduled(cron = "0 0 0 * * ?") +// public void task(){ +// LogProperties.PlumeLog plumeLog = logProperties.getPlumeLog(); +// if (plumeLog.getKeepDays()<=0){ +// return; +// } +// // 生成不需要删除的日志文件夹名称序列 +// Set logDirSeq = IntStream.rangeClosed(0, plumeLog.getKeepDays()) +// .mapToObj(i -> IndexUtil.getRunLogIndex(System.currentTimeMillis() - i * InitConfig.MILLS_ONE_DAY)) +// .collect(Collectors.toSet()); +// +// // 每天的日志文件夹进行清理 +// File dir = new File(InitConfig.LITE_MODE_LOG_PATH + "/data"); +// if (dir.isDirectory()) { +// File[] files = dir.listFiles(); +// if (Objects.isNull(files)){ +// return; +// } +// for (File file : files) { +// // 如果不是日志文件夹, 继续向下执行 +// if (!StrUtil.startWith(file.getName(),"")){ +// continue; +// } +// // 如果属于不需要删除的日志, 继续向下执行 +// if (logDirSeq.contains(file.getName())){ +// continue; +// } +// // 删除过时的日志文件夹 +// FileUtil.del(file); +// } +// } +// } +// +//} diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 94327117..521611d6 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -7,6 +7,9 @@ bootx-platform-parent 1.3.2 + + service-miniapp + 4.0.0 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java index de572def..90d661b6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java @@ -30,10 +30,10 @@ public class RoleController { @Operation(summary = "添加角色（返回角色对象）") @PostMapping(value = "/add") - public ResResult add(@RequestBody RoleParam roleParam) { + public ResResult add(@RequestBody RoleParam roleParam) { ValidationUtil.validateParam(roleParam); - RoleDto result = roleService.add(roleParam); - return Res.ok(result); + roleService.add(roleParam); + return Res.ok(); } @Operation(summary = "删除角色") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java index ac92c0f4..3bab7e79 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/dao/ClientManager.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; /** @@ -34,6 +35,13 @@ public class ClientManager extends BaseManager { .page(mpPage); } + /** + * 查询 + */ + public List findAllByDefaultEndow(Boolean defaultEndow){ + return findAllByField(Client::getDefaultEndow,defaultEndow); + } + public Optional findByCode(String code) { return findByField(Client::getCode, code); } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java index 54b95384..69d2d316 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java @@ -1,5 +1,7 @@ package cn.bootx.platform.iam.core.client.entity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.iam.core.client.convert.ClientConvert; import cn.bootx.platform.iam.param.client.ClientParam; @@ -25,6 +27,7 @@ import java.util.stream.Collectors; */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "认证终端",isAppend = true) @TableName("iam_client") @Accessors(chain = true) public class Client extends MpBaseEntity implements EntityBaseFunction { @@ -45,6 +48,10 @@ public class Client extends MpBaseEntity implements EntityBaseFunction { * 批量更新用户状态 */ public void setUpStatusBatch(List userIds, int status) { - lambdaUpdate().in(MpIdEntity::getId, userIds).set(UserInfo::getStatus, status).update(); + lambdaUpdate() + .in(MpIdEntity::getId, userIds) + .set(UserInfo::getStatus, status) + .set(MpDelEntity::getLastModifiedTime, LocalDateTime.now()) + .set(MpDelEntity::getLastModifier, SecurityUtil.getUserIdOrDefaultId()) + .update(); + } + + /** + * 批量重置用户密码 + */ + public void restartPasswordBatch(List userIds,String password){ + lambdaUpdate() + .in(MpIdEntity::getId, userIds) + .set(UserInfo::getPassword, password) + .set(MpDelEntity::getLastModifiedTime, LocalDateTime.now()) + .set(MpDelEntity::getLastModifier, SecurityUtil.getUserIdOrDefaultId()) + .update(); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java index 7d923490..9ee82d17 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserAdminService.java @@ -1,27 +1,27 @@ package cn.bootx.platform.iam.core.user.service; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import cn.bootx.platform.iam.core.client.dao.ClientManager; -import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.platform.iam.param.user.UserInfoParam; -import cn.bootx.platform.iam.param.user.UserRegisterParam; -import cn.bootx.platform.starter.auth.util.PasswordEncoder; -import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.iam.code.UserStatusCode; +import cn.bootx.platform.iam.core.client.dao.ClientManager; import cn.bootx.platform.iam.core.upms.service.UserRoleService; import cn.bootx.platform.iam.core.user.dao.UserExpandInfoManager; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; import cn.bootx.platform.iam.core.user.entity.UserInfo; -import cn.bootx.platform.iam.event.user.UserCreateEvent; import cn.bootx.platform.iam.dto.dept.DeptDto; import cn.bootx.platform.iam.dto.role.RoleDto; import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.bootx.platform.iam.dto.user.UserInfoWhole; +import cn.bootx.platform.iam.event.user.*; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.iam.param.user.UserInfoParam; +import cn.bootx.platform.iam.param.user.UserRegisterParam; +import cn.bootx.platform.starter.auth.util.PasswordEncoder; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; @@ -31,7 +31,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.validation.constraints.NotBlank; import java.time.LocalDateTime; import java.util.List; import java.util.stream.Collectors; @@ -77,6 +76,7 @@ public class UserAdminService { */ public void lock(Long userId) { userInfoManager.setUpStatus(userId, UserStatusCode.BAN); + eventPublisher.publishEvent(new UserLockEvent(this, userId)); } /** @@ -84,6 +84,7 @@ public class UserAdminService { */ public void lockBatch(List userIds) { userInfoManager.setUpStatusBatch(userIds, UserStatusCode.BAN); + eventPublisher.publishEvent(new UserLockEvent(this, userIds)); } /** @@ -91,6 +92,7 @@ public class UserAdminService { */ public void unlock(Long userId) { userInfoManager.setUpStatus(userId, UserStatusCode.NORMAL); + eventPublisher.publishEvent(new UserUnlockEvent(this, userId)); } /** @@ -98,6 +100,7 @@ public class UserAdminService { */ public void unlockBatch(List userIds) { userInfoManager.setUpStatusBatch(userIds, UserStatusCode.NORMAL); + eventPublisher.publishEvent(new UserUnlockEvent(this, userIds)); } /** @@ -112,13 +115,13 @@ public class UserAdminService { UserInfoParam userInfoParam = new UserInfoParam(); BeanUtil.copyProperties(param, userInfoParam); userInfoParam.setName(param.getUsername()); - // TODO 默认注册就有所有终端的权限, 后期优化 - List ids = clientManager.findAll() + // 添加默认注册就有权限的终端 + List clientIds = clientManager.findAllByDefaultEndow(true) .stream() .map(MpIdEntity::getId) .map(String::valueOf) .collect(Collectors.toList()); - userInfoParam.setClientIdList(ids); + userInfoParam.setClientIdList(clientIds); this.add(userInfoParam); } @@ -147,27 +150,37 @@ public class UserAdminService { UserExpandInfo userExpandInfo = new UserExpandInfo(); userExpandInfo.setInitialPassword(true).setId(userInfo.getId()); userExpandInfoManager.save(userExpandInfo); - // 发送用户注册事件 eventPublisher.publishEvent(new UserCreateEvent(this, userInfo.toDto())); - } /** * 重置密码 */ - public void restartPassword(Long userId, @NotBlank(message = "新密码不能为空") String newPassword) { + public void restartPassword(Long userId, String newPassword) { UserInfo userInfo = userInfoManager.findById(userId).orElseThrow(UserInfoNotExistsException::new); // 新密码进行加密 newPassword = passwordEncoder.encode(newPassword); userInfo.setPassword(newPassword); userInfoManager.updateById(userInfo); + eventPublisher.publishEvent(new UserRestartPasswordEvent(this, userInfo.getId())); + } + + /** + * 批量重置密码 + */ + public void restartPasswordBatch(List userIds, String newPassword){ + // 新密码进行加密 + String password = passwordEncoder.encode(newPassword); + // 批量重置密码 + userInfoManager.restartPasswordBatch(userIds,password); + eventPublisher.publishEvent(new UserRestartPasswordEvent(this, userIds)); } /** * 编辑用户信息 */ - public UserInfoDto update(UserInfoParam userInfoParam) { + public void update(UserInfoParam userInfoParam) { UserInfo userInfo = userInfoManager.findById(userInfoParam.getId()) .orElseThrow(UserInfoNotExistsException::new); userInfoParam.setPassword(null); @@ -178,7 +191,8 @@ public class UserAdminService { else { userInfo.setClientIds(""); } - return userInfoManager.updateById(userInfo).toDto(); + UserInfoDto userInfoDto = userInfoManager.updateById(userInfo).toDto(); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfoDto)); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java index 6bf7eeb9..7e6b51b6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/user/service/UserInfoService.java @@ -1,10 +1,6 @@ package cn.bootx.platform.iam.core.user.service; import cn.bootx.platform.common.core.exception.BizException; -import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.platform.iam.param.user.UserBaseInfoParam; -import cn.bootx.platform.starter.auth.util.PasswordEncoder; -import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.bootx.platform.iam.core.user.dao.UserExpandInfoManager; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserExpandInfo; @@ -12,9 +8,16 @@ import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.dto.user.LoginAfterUserInfo; import cn.bootx.platform.iam.dto.user.UserBaseInfoDto; import cn.bootx.platform.iam.dto.user.UserInfoDto; +import cn.bootx.platform.iam.event.user.UserChangePasswordEvent; +import cn.bootx.platform.iam.event.user.UserUpdateEvent; +import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; +import cn.bootx.platform.iam.param.user.UserBaseInfoParam; +import cn.bootx.platform.starter.auth.util.PasswordEncoder; +import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +43,8 @@ public class UserInfoService { private final PasswordEncoder passwordEncoder; + private final ApplicationEventPublisher eventPublisher; + /** * 登录后获取用户信息 */ @@ -92,6 +97,7 @@ public class UserInfoService { BeanUtil.copyProperties(param, userInfo, CopyOptions.create().ignoreNullValue()); userExpandInfoManager.updateById(userExpandInfo); userInfoManager.updateById(userInfo); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -116,6 +122,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfo.setLastChangePasswordTime(LocalDateTime.now()); userExpandInfoManager.updateById(userExpandInfo); + eventPublisher.publishEvent(new UserChangePasswordEvent(this,userInfo.getId())); } /** @@ -144,6 +151,7 @@ public class UserInfoService { userInfo.setPhone(phone); userInfoManager.updateById(userInfo); userAssistService.deletePhoneChangeCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this,userInfo.toDto())); } /** @@ -169,6 +177,7 @@ public class UserInfoService { userInfo.setEmail(email); userInfoManager.updateById(userInfo); userAssistService.deleteEmailChangeCaptcha(email); + eventPublisher.publishEvent(new UserUpdateEvent(this,userInfo.toDto())); } /** @@ -187,6 +196,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfoManager.updateById(userExpandInfo); userAssistService.deletePhoneForgetCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -204,6 +214,7 @@ public class UserInfoService { userInfoManager.updateById(userInfo); userExpandInfoManager.updateById(userExpandInfo); userAssistService.deleteEmailForgetCaptcha(email); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -223,6 +234,7 @@ public class UserInfoService { userInfo.setPhone(phone); userInfoManager.updateById(userInfo); userAssistService.deletePhoneChangeCaptcha(phone); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } /** @@ -242,6 +254,7 @@ public class UserInfoService { userInfo.setEmail(email); userInfoManager.updateById(userInfo); userAssistService.deleteEmailChangeCaptcha(userInfo.getEmail()); + eventPublisher.publishEvent(new UserUpdateEvent(this, userInfo.toDto())); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java index bf223460..b5e7c400 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/client/ClientDto.java @@ -33,6 +33,9 @@ public class ClientDto extends BaseDto { @Schema(description = "是否可用") private Boolean enable; + @Schema(description = "新注册的用户是否默认赋予该终端") + private Boolean defaultEndow; + @Schema(description = "关联登录方式id") private List loginTypeIdList = new ArrayList<>(); diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java new file mode 100644 index 00000000..a224af4e --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleCreateEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.iam.event.role; + +import cn.bootx.platform.iam.dto.role.RoleDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 角色创建时间 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class RoleCreateEvent extends ApplicationEvent { + private final RoleDto role; + public RoleCreateEvent(Object source, RoleDto role) { + super(source); + this.role = role; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java new file mode 100644 index 00000000..93d08c66 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleDeleteEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.role; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 角色删除事件 + * @author xxm + * @since 2023/8/2 + */ +@Getter +public class RoleDeleteEvent extends ApplicationEvent { + private final List roleIds; + + + public RoleDeleteEvent(Object source, Long ...roleIds) { + super(source); + if (Objects.nonNull(roleIds)){ + this.roleIds = Arrays.asList(roleIds); + } else { + this.roleIds = null; + } + } + public RoleDeleteEvent(Object source, List roleIds) { + super(source); + this.roleIds = roleIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java new file mode 100644 index 00000000..5c0fa1c8 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/role/RoleUpdateEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.iam.event.role; + +import cn.bootx.platform.iam.dto.role.RoleDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 角色更新事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class RoleUpdateEvent extends ApplicationEvent { + private final RoleDto role; + public RoleUpdateEvent(Object source, RoleDto role) { + super(source); + this.role = role; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java new file mode 100644 index 00000000..6e2e4971 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserChangePasswordEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 更改用户密码操作 + * @author xxm + * @since 2023/8/2 + */ +@Getter +public class UserChangePasswordEvent extends ApplicationEvent { + private final List userIds; + + public UserChangePasswordEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + + public UserChangePasswordEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java index a5e39c10..983fb760 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserCreateEvent.java @@ -12,7 +12,6 @@ import org.springframework.context.ApplicationEvent; */ @Getter public class UserCreateEvent extends ApplicationEvent { - private final UserInfoDto userInfo; public UserCreateEvent(Object source, UserInfoDto userInfo) { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java new file mode 100644 index 00000000..df430a3e --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserDeleteEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 用户删除事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserDeleteEvent extends ApplicationEvent { + private final List userIds; + + public UserDeleteEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + + public UserDeleteEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java index c72825fd..98107d5d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserLockEvent.java @@ -25,4 +25,8 @@ public class UserLockEvent extends ApplicationEvent { this.userIds = null; } } + public UserLockEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java new file mode 100644 index 00000000..9a23a18b --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserRestartPasswordEvent.java @@ -0,0 +1,31 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 重置用户密码操作 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserRestartPasswordEvent extends ApplicationEvent { + private final List userIds; + + public UserRestartPasswordEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + public UserRestartPasswordEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java new file mode 100644 index 00000000..62ce405a --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUnlockEvent.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * 解锁用户 + * @author xxm + * @since 2023/7/29 + */ +@Getter +public class UserUnlockEvent extends ApplicationEvent { + + private final List userIds; + + public UserUnlockEvent(Object source, Long ...userIds) { + super(source); + if (Objects.nonNull(userIds)){ + this.userIds = Arrays.asList(userIds); + } else { + this.userIds = null; + } + } + public UserUnlockEvent(Object source, List userIds) { + super(source); + this.userIds = userIds; + } +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java new file mode 100644 index 00000000..47364327 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserUpdateEvent.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.iam.event.user; + +import cn.bootx.platform.iam.dto.user.UserInfoDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 用户信息更新事件 + * @author xxm + * @since 2023/7/31 + */ +@Getter +public class UserUpdateEvent extends ApplicationEvent { + private final UserInfoDto userInfo; + + public UserUpdateEvent(Object source, UserInfoDto userInfo) { + super(source); + this.userInfo = userInfo; + } + +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java index 97c1c98b..7bc90013 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/client/ClientParam.java @@ -32,6 +32,9 @@ public class ClientParam { @Schema(description = "是否可用") private Boolean enable; + @Schema(description = "新注册的用户是否默认赋予该终端") + private Boolean defaultEndow; + @Schema(description = "关联终端") private List loginTypeIdList; diff --git a/bootx-services/service-miniapp/pom.xml b/bootx-services/service-miniapp/pom.xml new file mode 100644 index 00000000..5292f2c9 --- /dev/null +++ b/bootx-services/service-miniapp/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + cn.bootx.platform + bootx-services + 1.3.2 + + + service-miniapp + + + + + com.mysql + mysql-connector-j + runtime + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + cn.bootx.platform + common-starter-auth + + + + + cn.bootx.platform + common-starter-audit-log + + + + cn.bootx.platform + common-super-query + + + + + cn.bootx.platform + service-baseapi + ${bootx-platform.version} + + + + diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java new file mode 100644 index 00000000..16fe14e9 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/MiniAppApplication.java @@ -0,0 +1,15 @@ +package cn.bootx.platform.miniapp; + +import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.ComponentScan; + +/** + * 微信小程序 + * @author xxm + * @since 2023/8/2 + */ +@ComponentScan +@MapperScan(annotationClass = Mapper.class) +public class MiniAppApplication { +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java new file mode 100644 index 00000000..cc45f6ca --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/UserProtocolController.java @@ -0,0 +1,67 @@ +package cn.bootx.platform.miniapp.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.miniapp.core.protocol.service.UserProtocolService; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Tag(name ="用户协议") +@RestController +@RequestMapping("/user/protocol") +@RequiredArgsConstructor +public class UserProtocolController { + private final UserProtocolService userProtocolService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody UserProtocolParam param){ + userProtocolService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody UserProtocolParam param){ + userProtocolService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + userProtocolService.delete(id); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(userProtocolService.findById(id)); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(userProtocolService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, UserProtocolParam userProtocolParam){ + return Res.ok(userProtocolService.page(pageParam,userProtocolParam)); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java new file mode 100644 index 00000000..00670e76 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/convert/UserProtocolConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.miniapp.core.protocol.convert; + +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Mapper +public interface UserProtocolConvert { + UserProtocolConvert CONVERT = Mappers.getMapper(UserProtocolConvert.class); + + UserProtocol convert(UserProtocolParam in); + + UserProtocolDto convert(UserProtocol in); + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java new file mode 100644 index 00000000..b5f0928e --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolManager.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.miniapp.core.protocol.dao; + +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Repository +@RequiredArgsConstructor +public class UserProtocolManager extends BaseManager { + + /** + * 分页 + */ + public Page page(PageParam pageParam, UserProtocolParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, UserProtocol.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(UserProtocol::getId)); + return this.page(mpPage,wrapper); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java new file mode 100644 index 00000000..23fe1e65 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/dao/UserProtocolMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.miniapp.core.protocol.dao; + +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Mapper +public interface UserProtocolMapper extends BaseMapper { +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java new file mode 100644 index 00000000..1c502eba --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/entity/UserProtocol.java @@ -0,0 +1,48 @@ +package cn.bootx.platform.miniapp.core.protocol.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.miniapp.core.protocol.convert.UserProtocolConvert; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** +* 用户协议 +* @author xxm +* @since 2023-08-02 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@TableName("miniapp_user_protocol") +public class UserProtocol extends MpBaseEntity implements EntityBaseFunction{ + + /** 编码 */ + @DbColumn(comment = "编码") + private String code; + /** 内容 */ + @DbColumn(comment = "内容") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) + private String content; + /** 备注 */ + @DbColumn(comment = "备注") + private String remark; + + /** 创建对象 */ + public static UserProtocol init(UserProtocolParam in) { + return UserProtocolConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public UserProtocolDto toDto() { + return UserProtocolConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java new file mode 100644 index 00000000..1d43b0a0 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/protocol/service/UserProtocolService.java @@ -0,0 +1,76 @@ +package cn.bootx.platform.miniapp.core.protocol.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.miniapp.core.protocol.dao.UserProtocolManager; +import cn.bootx.platform.miniapp.core.protocol.entity.UserProtocol; +import cn.bootx.platform.miniapp.dto.protocol.UserProtocolDto; +import cn.bootx.platform.miniapp.param.protocol.UserProtocolParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class UserProtocolService { + private final UserProtocolManager userProtocolManager; + + /** + * 添加 + */ + public void add(UserProtocolParam param){ + UserProtocol userProtocol = UserProtocol.init(param); + userProtocolManager.save(userProtocol); + } + + /** + * 修改 + */ + public void update(UserProtocolParam param){ + UserProtocol userProtocol = userProtocolManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + + BeanUtil.copyProperties(param,userProtocol, CopyOptions.create().ignoreNullValue()); + userProtocolManager.updateById(userProtocol); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,UserProtocolParam userProtocolParam){ + return MpUtil.convert2DtoPageResult(userProtocolManager.page(pageParam,userProtocolParam)); + } + + /** + * 获取单条 + */ + public UserProtocolDto findById(Long id){ + return userProtocolManager.findById(id).map(UserProtocol::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(userProtocolManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + userProtocolManager.deleteById(id); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java new file mode 100644 index 00000000..05a098ff --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/protocol/UserProtocolDto.java @@ -0,0 +1,27 @@ +package cn.bootx.platform.miniapp.dto.protocol; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "用户协议") +@Accessors(chain = true) +public class UserProtocolDto extends BaseDto { + + @Schema(description = "编码") + private String code; + @Schema(description = "内容") + private String content; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java new file mode 100644 index 00000000..a4f2b534 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/protocol/UserProtocolParam.java @@ -0,0 +1,26 @@ +package cn.bootx.platform.miniapp.param.protocol; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 用户协议 + * @author xxm + * @since 2023-08-02 + */ +@Data +@Schema(title = "用户协议") +@Accessors(chain = true) +public class UserProtocolParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "编码") + private String code; + @Schema(description = "内容") + private String content; + @Schema(description = "备注") + private String remark; +} diff --git a/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..96eb62d2 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.bootx.platform.miniapp.MiniAppApplication diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index d8438a04..9ea57f24 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -41,7 +41,6 @@ spring-boot-starter-undertow - org.flywaydb @@ -56,6 +55,13 @@ ${bootx-platform.version} + + + cn.bootx.platform + service-miniapp + ${bootx-platform.version} + + diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 877521a2..9eaaf517 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -82,8 +82,7 @@ logging: # 自动建表配置 mybatis-table: update-type: update - database-type: mysql - scan-package: cn.bootx + scan-package: cn.bootx.platform # 项目配置 bootx: common: @@ -104,6 +103,7 @@ bootx: "[消息服务]": cn.bootx.platform.notice "[演示模块]": cn.bootx.demo "[可视化大屏]": cn.bootx.platform.visualization + "[微信小程序]": cn.bootx.platform.miniapp "[第三方对接]": - cn.bootx.platform.starter.dingtalk - cn.bootx.platform.starter.wecom diff --git a/pom.xml b/pom.xml index 428defad..a30bba5d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.6.1 1.6.15 3.23.0 - 4.1.0 + 4.2.0 1.5.5.Final 0.2.0 1.6.2 -- Gitee From 79efe4218b07a85c91c73c04376112f318158f4b Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 4 Aug 2023 17:11:39 +0800 Subject: [PATCH 12/35] =?UTF-8?q?feat=20=E9=9B=86=E6=88=90sms4j,=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9F=AD=E4=BF=A1=E6=B8=A0=E9=81=93=E5=92=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 22 +++- _license/LICENSE.md | 3 + .../auth/handler/LoginFailureHandler.java | 2 +- .../auth/handler/LoginSuccessHandler.java | 2 +- .../gen/service/CodeGeneratorService.java | 1 - .../controller/QuerySqlController.java | 29 ++++- .../core/sql/service/QuerySqlService.java | 7 ++ .../iam/controller/RoleController.java | 4 +- .../core/upms/service/UserRoleService.java | 12 +- .../iam/event/user/UserAssignRoleEvent.java | 23 ++++ bootx-services/service-notice/pom.xml | 6 + .../notice/code/MessageTemplateCode.java | 14 +-- .../notice/code/SmsChannelStatusCode.java | 14 +++ .../controller/SmsTemplateController.java | 67 ++++++++++ .../sms/convert/SmsChannelConfigConvert.java | 22 ++++ .../core/sms/convert/SmsTemplateConvert.java | 22 ++++ .../core/sms/dao/SmsTemplateManager.java | 35 ++++++ .../core/sms/dao/SmsTemplateMapper.java | 14 +++ .../core/sms/entity/SmsChannelConfig.java | 71 +++++++++-- .../notice/core/sms/entity/SmsTemplate.java | 50 ++++++++ .../core/sms/service/SmsChannelService.java | 118 ++++++++++++++++++ .../core/sms/service/SmsTemplateService.java | 76 +++++++++++ .../core/template/entity/MessageTemplate.java | 2 +- .../notice/dto/sms/SmsChannelConfigDto.java | 35 ++++++ .../notice/dto/sms/SmsTemplateDto.java | 29 +++++ .../dto/template/MessageTemplateDto.java | 2 +- .../param/sms/SmsChannelConfigParam.java | 37 ++++++ .../notice/param/sms/SmsTemplateParam.java | 29 +++++ .../param/template/MessageTemplateParam.java | 3 +- .../src/main/resources/application.yml | 11 +- pom.xml | 7 ++ 31 files changed, 722 insertions(+), 47 deletions(-) create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java diff --git a/_doc/Task.md b/_doc/Task.md index 1515b48f..1688878f 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,14 +1,24 @@ ## 1.3.3 - x 终端可以设置新注册用户是否默认拥有该终端的权限 +- 添加短信配置, 集成SMS4J +- 添加短信模板功能, 可以与各短信商渠道进行同步 - 添加各种事件 - x 用户相关 - - 角色相关 -- 添加配置备份功能(菜单/系统参数/字典) + - x 角色相关 +- 添加配置备份功能(菜单/系统参数/字典), csv方式 - 添加各种导入和导出功能 - 添加各种批量操作功能 - 一键缓存同步和更新操作(字典/参数) -- vxe暗黑模式适配 -- MiniApp添加用户协议/隐私协议等 - -1.3.x +- x vxe暗黑模式适配 +- MiniApp添加用户协议/隐私协议等(富文本) +- x 删除工作流相关代码 +- x 新版自定义表单集成(epic-designer尚处于测试版) +- 导入数据支持选择: 跳过, 覆盖, 报错 +## 1.3.x - PostgreSQL 数据库适配 +- 优化异常类,将各种异常类进行拆分出来 +- 优化参数校验, 将各种入参进行校验 +- 代码生成模板支持配置 +- 代码生成支持预览 +- Sql查询功能 +- 支持预览编辑完成的富文本 diff --git a/_license/LICENSE.md b/_license/LICENSE.md index 19fcc34a..258d7c4d 100644 --- a/_license/LICENSE.md +++ b/_license/LICENSE.md @@ -41,3 +41,6 @@ https://gitee.com/xiaoym/knife4j easy_trans 一个注解搞定数据翻译： https://gitee.com/dromara/easy_trans + +vxe-table暗黑主题灵感 +https://github.com/adoin diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java index 6fbc2084..220e24d9 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginFailureHandler.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * 登录失败处理器 + * 登录失败处理器接口 * * @author xxm * @since 2021/8/13 diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java index c8a0d5a9..a3c032a0 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/handler/LoginSuccessHandler.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; /** - * 登录成功处理器 + * 登录成功处理器接口 * * @author xxm * @since 2021/8/13 diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java index c7771367..9d337349 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/service/CodeGeneratorService.java @@ -16,7 +16,6 @@ import cn.hutool.core.text.NamingCase; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java index 2cb823ca..768306c2 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/QuerySqlController.java @@ -1,16 +1,14 @@ package cn.bootx.platform.baseapi.controller; import cn.bootx.platform.baseapi.core.sql.service.QuerySqlService; +import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; +import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.baseapi.param.sql.QueryFieldParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -29,6 +27,27 @@ public class QuerySqlController { private final QuerySqlService querySqlService; + + @Operation(summary = "分页查询") + @GetMapping("/page") + public ResResult> page(){ + return Res.ok(); + } + + @Operation(summary = "新建") + @PostMapping("/add") + public ResResult add(){ + querySqlService.add(); + return Res.ok(); + } + + @Operation(summary = "修改") + @PostMapping("/update") + public ResResult update(){ + querySqlService.update(); + return Res.ok(); + } + @Operation(summary = "测试SQL解析和执行") @PostMapping("/test") public ResResult test(@RequestBody Map map) { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java index dd51a369..8766c897 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/sql/service/QuerySqlService.java @@ -13,6 +13,7 @@ import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.starter.auth.util.SecurityUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.db.Entity; +import cn.hutool.db.PageResult; import cn.hutool.db.handler.EntityHandler; import cn.hutool.db.handler.EntityListHandler; import cn.hutool.db.sql.SqlExecutor; @@ -58,10 +59,16 @@ public class QuerySqlService { /** * 修改 */ + public void update(){ + + } /** * 分页查询 */ + public PageResult page(){ + return new PageResult<>(); + } /** * 执行SQL查询 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java index 90d661b6..b3b4cee2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/RoleController.java @@ -47,8 +47,8 @@ public class RoleController { @PostMapping(value = "/update") public ResResult update(@RequestBody RoleParam roleParam) { ValidationUtil.validateParam(roleParam); - RoleDto result = roleService.update(roleParam); - return Res.ok(result); + roleService.update(roleParam); + return Res.ok(); } @Operation(summary = "通过ID查询角色") diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java index 4ffda028..7da91522 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/upms/service/UserRoleService.java @@ -2,19 +2,22 @@ package cn.bootx.platform.iam.core.upms.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.util.ResultConvertUtil; -import cn.bootx.platform.iam.core.user.dao.UserInfoManager; -import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.core.role.dao.RoleManager; import cn.bootx.platform.iam.core.upms.dao.UserRoleManager; import cn.bootx.platform.iam.core.upms.entity.UserRole; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.iam.dto.role.RoleDto; +import cn.bootx.platform.iam.event.user.UserAssignRoleEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.CacheEvict; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -38,6 +41,9 @@ public class UserRoleService { private final UserRoleManager userRoleManager; + private final ApplicationEventPublisher eventPublisher; + + /** * 给用户分配角色 */ @@ -49,6 +55,7 @@ public class UserRoleService { // 然后给用户添加角色 List userRoles = this.createUserRoles(userId, roleIds); userRoleManager.saveAll(userRoles); + eventPublisher.publishEvent(new UserAssignRoleEvent(this, Collections.singletonList(userId),roleIds)); } /** @@ -67,6 +74,7 @@ public class UserRoleService { .flatMap(Collection::stream) .collect(Collectors.toList()); userRoleManager.saveAll(userRoles); + eventPublisher.publishEvent(new UserAssignRoleEvent(this, userIds,roleIds)); } /** diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java new file mode 100644 index 00000000..e3aec38e --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/event/user/UserAssignRoleEvent.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.iam.event.user; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.List; + +/** + * 用户分配角色事件 + * @author xxm + * @since 2023/8/3 + */ +@Getter +public class UserAssignRoleEvent extends ApplicationEvent { + private final List userIds; + private final List roleIds; + + public UserAssignRoleEvent(Object source, List userIds, List roleIds) { + super(source); + this.userIds = userIds; + this.roleIds = roleIds; + } +} diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 6ebedc26..6c670873 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -73,5 +73,11 @@ cn.bootx.platform common-starter-wecom + + + + org.dromara.sms4j + sms4j-spring-boot-starter + diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java index 331874fd..a8e24118 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/MessageTemplateCode.java @@ -9,21 +9,15 @@ package cn.bootx.platform.notice.code; public interface MessageTemplateCode { /** 站内信 */ - int SITE = 0; + String SITE = "site"; /** 钉钉 */ - int DING_TALK = 1; + String DING_TALK = "ding_talk"; /** 钉钉机器人 */ - int DING_TALK_ROBOT = 2; - - /** 短信 */ - int SMS = 3; + String DING_TALK_ROBOT = "ding_talk_robot"; /** Email */ - int EMAIL = 4; - - /** 微信 */ - int WECHAT = 5; + String EMAIL = "email"; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java new file mode 100644 index 00000000..ae6a7b9d --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/code/SmsChannelStatusCode.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.notice.code; + +/** + * 短信渠道商配置状态 + * @author xxm + * @since 2023/8/3 + */ +public interface SmsChannelStatusCode { + /** 正常 */ + String NORMAL = "normal"; + + /** 停用 */ + String FORBIDDEN = "forbidden"; +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java new file mode 100644 index 00000000..e112cf03 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java @@ -0,0 +1,67 @@ +package cn.bootx.platform.notice.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.notice.core.sms.service.SmsTemplateService; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Tag(name ="短信模板配置") +@RestController +@RequestMapping("/sms") +@RequiredArgsConstructor +public class SmsTemplateController { + private final SmsTemplateService smsTemplateService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody SmsTemplateParam param){ + smsTemplateService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody SmsTemplateParam param){ + smsTemplateService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + smsTemplateService.delete(id); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(smsTemplateService.findById(id)); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(smsTemplateService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, SmsTemplateParam smsTemplateParam){ + return Res.ok(smsTemplateService.page(pageParam,smsTemplateParam)); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java new file mode 100644 index 00000000..ccfdf66d --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsChannelConfigConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.notice.core.sms.convert; + +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsChannelConfigConvert { + SmsChannelConfigConvert CONVERT = Mappers.getMapper(SmsChannelConfigConvert.class); + + SmsChannelConfig convert(SmsChannelConfigParam in); + + SmsChannelConfigDto convert(SmsChannelConfig in); + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java new file mode 100644 index 00000000..e65f82fd --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/convert/SmsTemplateConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.notice.core.sms.convert; + +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsTemplateConvert { + SmsTemplateConvert CONVERT = Mappers.getMapper(SmsTemplateConvert.class); + + SmsTemplate convert(SmsTemplateParam in); + + SmsTemplateDto convert(SmsTemplate in); + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java new file mode 100644 index 00000000..81212869 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateManager.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.notice.core.sms.dao; + +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Repository +@RequiredArgsConstructor +public class SmsTemplateManager extends BaseManager { + + /** + * 分页 + */ + public Page page(PageParam pageParam, SmsTemplateParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, SmsTemplate.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(SmsTemplate::getId)); + return this.page(mpPage,wrapper); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java new file mode 100644 index 00000000..09ee2fbe --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsTemplateMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.notice.core.sms.dao; + +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Mapper +public interface SmsTemplateMapper extends BaseMapper { +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index ccf0d79a..8bb2a90c 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -1,10 +1,19 @@ package cn.bootx.platform.notice.core.sms.entity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.notice.core.sms.convert.SmsChannelConfigConvert; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.dromara.sms4j.provider.enumerate.SupplierType; /** * 短信渠道配置 @@ -13,19 +22,61 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data +@DbTable(comment = "短信渠道配置") @Accessors(chain = true) @TableName("notice_sms_channel_config") -public class SmsChannelConfig extends MpBaseEntity { +public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction { - /** 渠道编码 */ + /** + * 渠道类型编码 + * @see SupplierType#name() + */ + @DbColumn(comment = "渠道类型编码") private String code; - /** 短信签名 */ - private String signature; - /** 短信ApiKey */ - private String apiKey; - /** 短信Api秘钥 */ - private String apiSecret; - /** 回调地址 */ - private String url; + /** + * 渠道类型名称 + * @see SupplierType#getName() + */ + @DbColumn(comment = "渠道类型名称") + private String name; + + /** + * 状态 + * @see cn.bootx.platform.notice.code.SmsChannelStatusCode + */ + @DbColumn(comment = "状态") + private String state; + + /** AccessKey */ + @DbColumn(comment = "AccessKey") + private String accessKey; + + /** AccessSecret */ + @DbColumn(comment = "AccessSecret") + private String accessSecret; + + /** 配置字符串 */ + @DbMySqlFieldType(MySqlFieldTypeEnum.TEXT) + @DbColumn(comment = "状态") + private String config; + + /** 图片 */ + @DbColumn(comment = "图片") + private Long image; + + /** 备注 */ + @DbColumn(comment = "状态") + private String remark; + + /** 创建对象 */ + public static SmsChannelConfig init(SmsChannelConfigParam in) { + return SmsChannelConfigConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public SmsChannelConfigDto toDto() { + return SmsChannelConfigConvert.CONVERT.convert(this); + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java new file mode 100644 index 00000000..49254156 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java @@ -0,0 +1,50 @@ +package cn.bootx.platform.notice.core.sms.entity; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDate; +import java.time.LocalTime; + +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; + +import com.baomidou.mybatisplus.annotation.TableName; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import cn.bootx.platform.notice.core.sms.convert.SmsTemplateConvert; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** +* 短信模板配置 +* @author xxm +* @since 2023-08-03 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@TableName("notice_sms_template") +public class SmsTemplate extends MpBaseEntity implements EntityBaseFunction{ + + /** 短信渠道商类型 */ + private String supplierType; + /** 短信渠道商类型 */ + private String templateId; + /** 短信模板名称 */ + private String name; + /** 短信模板内容 */ + private String content; + + /** 创建对象 */ + public static SmsTemplate init(SmsTemplateParam in) { + return SmsTemplateConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public SmsTemplateDto toDto() { + return SmsTemplateConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java new file mode 100644 index 00000000..a65ed398 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java @@ -0,0 +1,118 @@ +package cn.bootx.platform.notice.core.sms.service; + +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.notice.core.sms.dao.SmsChannelConfigManager; +import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.core.config.SupplierFactory; +import org.dromara.sms4j.ctyun.config.CtyunConfig; +import org.dromara.sms4j.emay.config.EmayConfig; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.netease.config.NeteaseConfig; +import org.dromara.sms4j.provider.enumerate.SupplierType; +import org.dromara.sms4j.tencent.config.TencentConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.dromara.sms4j.yunpian.config.YunpianConfig; +import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SmsChannelService { + + private final SmsChannelConfigManager smsChannelConfigManager; + + /** + * 查询全部配置 + */ + public List findAll(){ + // 遍历数据库 + Map map = smsChannelConfigManager.findAll() + .stream() + .collect(Collectors.toMap(SmsChannelConfig::getCode, Function.identity(), CollectorsFunction::retainLatest)); + return Arrays.stream(SupplierType.values()) + .map(type-> Optional.ofNullable(map.get(type.name().toLowerCase())) + .orElse(new SmsChannelConfig() + .setCode(type.name().toLowerCase()) + .setName(type.getName()))) + .collect(Collectors.toList()); + } + + /** + * 添加 + */ + public void add(){ + + } + + /** + * 更新 + */ + public void update(){ + } + + /** + * 启动成功初始化 + */ + @EventListener(WebServerInitializedEvent.class) + public void init(){ + + List smsChannelConfigs = smsChannelConfigManager.findAll(); + + for (SmsChannelConfig channelConfig : smsChannelConfigs) { + SupplierType supplierType = getSupplierType(channelConfig.getCode()); + String config = channelConfig.getConfig(); + if (supplierType == SupplierType.ALIBABA) { + SupplierFactory.setAlibabaConfig(JacksonUtil.toBean(config,AlibabaConfig.class)); + } else if (supplierType == SupplierType.HUAWEI) { + SupplierFactory.setHuaweiConfig(JacksonUtil.toBean(config,HuaweiConfig.class)); + } else if (supplierType == SupplierType.UNI_SMS) { + SupplierFactory.setUniConfig(JacksonUtil.toBean(config,UniConfig.class)); + } else if (supplierType == SupplierType.TENCENT) { + SupplierFactory.setTencentConfig(JacksonUtil.toBean(config,TencentConfig.class)); + } else if (supplierType == SupplierType.YUNPIAN) { + SupplierFactory.setYunpianConfig(JacksonUtil.toBean(config,YunpianConfig.class)); + } else if (supplierType == SupplierType.JD_CLOUD) { + SupplierFactory.setJdCloudConfig(JacksonUtil.toBean(config,JdCloudConfig.class)); + } else if (supplierType == SupplierType.CLOOPEN) { + SupplierFactory.setCloopenConfig(JacksonUtil.toBean(config,CloopenConfig.class)); + } else if (supplierType == SupplierType.EMAY) { + SupplierFactory.setEmayConfig(JacksonUtil.toBean(config,EmayConfig.class)); + } else if (supplierType == SupplierType.CTYUN) { + SupplierFactory.setCtyunConfig(JacksonUtil.toBean(config,CtyunConfig.class)); + } else if (supplierType == SupplierType.NETEASE) { + SupplierFactory.setNeteaseConfig(JacksonUtil.toBean(config,NeteaseConfig.class)); + } else { + throw new SmsBlendException("短信加载失败！请检查配置类型."); + } + } + + } + + /** + * 获取 短信供应商 枚举 + */ + public SupplierType getSupplierType(String code){ + return Arrays.stream(SupplierType.values()) + .filter(supplierType -> supplierType.name().equalsIgnoreCase(code)) + .findFirst() + .orElseThrow(() -> new BizException("短信供应商未找到")); + } + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java new file mode 100644 index 00000000..7a00b82a --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsTemplateService.java @@ -0,0 +1,76 @@ +package cn.bootx.platform.notice.core.sms.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.notice.core.sms.dao.SmsTemplateManager; +import cn.bootx.platform.notice.core.sms.entity.SmsTemplate; +import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; +import cn.bootx.platform.notice.param.sms.SmsTemplateParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class SmsTemplateService { + private final SmsTemplateManager smsTemplateManager; + + /** + * 添加 + */ + public void add(SmsTemplateParam param){ + SmsTemplate smsTemplate = SmsTemplate.init(param); + smsTemplateManager.save(smsTemplate); + } + + /** + * 修改 + */ + public void update(SmsTemplateParam param){ + SmsTemplate smsTemplate = smsTemplateManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + + BeanUtil.copyProperties(param,smsTemplate, CopyOptions.create().ignoreNullValue()); + smsTemplateManager.updateById(smsTemplate); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,SmsTemplateParam smsTemplateParam){ + return MpUtil.convert2DtoPageResult(smsTemplateManager.page(pageParam,smsTemplateParam)); + } + + /** + * 获取单条 + */ + public SmsTemplateDto findById(Long id){ + return smsTemplateManager.findById(id).map(SmsTemplate::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(smsTemplateManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + smsTemplateManager.deleteById(id); + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java index a0cd526b..931748f4 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/template/entity/MessageTemplate.java @@ -33,7 +33,7 @@ public class MessageTemplate extends MpBaseEntity implements EntityBaseFunction< * 模板类型 * @see MessageTemplateCode */ - private Integer type; + private String type; public static MessageTemplate init(MessageTemplateParam in) { return MessageTemplateConvert.CONVERT.convert(in); diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java new file mode 100644 index 00000000..34a18633 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.notice.dto.sms; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-04 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "短信渠道配置") +@Accessors(chain = true) +public class SmsChannelConfigDto extends BaseDto { + + @Schema(description = "渠道类型编码") + private String code; + @Schema(description = "渠道类型名称") + private String name; + @Schema(description = "状态") + private String state; + @Schema(description = "AccessKey") + private String accessKey; + @Schema(description = "AccessSecret") + private String accessSecret; + @Schema(description = "配置") + private String config; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java new file mode 100644 index 00000000..d97dc74c --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsTemplateDto.java @@ -0,0 +1,29 @@ +package cn.bootx.platform.notice.dto.sms; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "短信模板配置") +@Accessors(chain = true) +public class SmsTemplateDto extends BaseDto { + + @Schema(description = "短信渠道商类型") + private String supplierType; + @Schema(description = "短信渠道商类型") + private String templateId; + @Schema(description = "短信模板名称") + private String name; + @Schema(description = "短信模板内容") + private String content; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java index c0a1af70..e330b292 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/template/MessageTemplateDto.java @@ -39,6 +39,6 @@ public class MessageTemplateDto extends BaseDto implements Serializable { * 模板类型 * @see MessageTemplateCode */ - private Integer type; + private String type; } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java new file mode 100644 index 00000000..8b360d4a --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java @@ -0,0 +1,37 @@ +package cn.bootx.platform.notice.param.sms; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 短信渠道配置 + * @author xxm + * @since 2023-08-04 + */ +@Data +@Schema(title = "短信渠道配置") +@Accessors(chain = true) +public class SmsChannelConfigParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "渠道类型编码") + private String code; + @Schema(description = "渠道类型名称") + private String name; + @Schema(description = "状态") + private String state; + @Schema(description = "AccessKey") + private String accessKey; + @Schema(description = "AccessSecret") + private String accessSecret; + @Schema(description = "图片") + private Long image; + @Schema(description = "配置") + private String config; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java new file mode 100644 index 00000000..e0613dac --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsTemplateParam.java @@ -0,0 +1,29 @@ +package cn.bootx.platform.notice.param.sms; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 短信模板配置 + * @author xxm + * @since 2023-08-03 + */ +@Data +@Schema(title = "短信模板配置") +@Accessors(chain = true) +public class SmsTemplateParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "短信渠道商类型") + private String supplierType; + @Schema(description = "短信渠道商类型") + private String templateId; + @Schema(description = "短信模板名称") + private String name; + @Schema(description = "短信模板内容") + private String content; + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java index 412db126..3002ff1f 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/template/MessageTemplateParam.java @@ -45,6 +45,5 @@ public class MessageTemplateParam implements Serializable { * 模板类型 * @see MessageTemplateCode */ - private Integer type; - + private String type; } diff --git a/bootx-start/src/main/resources/application.yml b/bootx-start/src/main/resources/application.yml index 07257667..10ca25df 100644 --- a/bootx-start/src/main/resources/application.yml +++ b/bootx-start/src/main/resources/application.yml @@ -32,8 +32,9 @@ mybatis-plus: sa-token: is-print: false token-name: AccessToken -# 工作流 -flowable: - activityFontName: "宋体" - annotation-font-name: "宋体" - label-font-name: "宋体" +# 短信配置 +sms: + # 是否使用redis进行缓存 默认false + redis-cache: true + # 打印banner + is-print: false diff --git a/pom.xml b/pom.xml index a30bba5d..02bf7279 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,7 @@ 1.3.81 2.2.5 2.7.0 + 2.2.0 1.5.3 @@ -365,6 +366,12 @@ common-starter-wecom ${bootx-platform.version} + + + org.dromara.sms4j + sms4j-spring-boot-starter + ${sms4j.version} + -- Gitee From e36b235991677efff5f8622cef11de5855e015e6 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Sat, 5 Aug 2023 17:37:47 +0800 Subject: [PATCH 13/35] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E6=B8=A0=E9=81=93=E9=85=8D=E7=BD=AE,=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 2 + .../common-starter-file/pom.xml | 6 + .../starter/file/code/FileUploadTypeEnum.java | 2 + .../configuration/FileUploadProperties.java | 15 +++ .../file/controller/FIleUpLoadController.java | 7 + .../starter/file/dao/JdbcFileDataManager.java | 14 ++ .../starter/file/dao/JdbcFileDataMapper.java | 14 ++ .../starter/file/entity/JdbcFileData.java | 32 +++++ .../file/service/FileUploadService.java | 15 +++ .../file/service/impl/JdbcUploadService.java | 117 +++++++++++++++++ .../file/service/impl/MinioUploadService.java | 14 +- .../SmsChannelConfigController.java | 53 ++++++++ .../controller/SmsTemplateController.java | 2 +- .../core/sms/dao/SmsChannelConfigManager.java | 14 ++ .../core/sms/entity/SmsChannelConfig.java | 11 +- ...vice.java => SmsChannelConfigService.java} | 121 ++++++++++++------ .../notice/dto/sms/SmsChannelConfigDto.java | 2 + .../notice/event/sms/SmsChannelAddEvent.java | 20 +++ .../sms/SmsChannelDisableEnableEvent.java | 19 +++ .../event/sms/SmsChannelEnableEvent.java | 19 +++ .../event/sms/SmsChannelUpdateEvent.java | 20 +++ .../param/sms/SmsChannelConfigParam.java | 2 + bootx-start/pom.xml | 7 + .../src/main/resources/application-dev.yml | 5 +- 24 files changed, 480 insertions(+), 53 deletions(-) create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java rename bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/{SmsChannelService.java => SmsChannelConfigService.java} (36%) create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java create mode 100644 bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java diff --git a/_doc/Task.md b/_doc/Task.md index 1688878f..b9c66051 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,10 +1,12 @@ ## 1.3.3 - x 终端可以设置新注册用户是否默认拥有该终端的权限 +- x 增加一种数据库文件存储方式，作为轻量级功能进行使用 - 添加短信配置, 集成SMS4J - 添加短信模板功能, 可以与各短信商渠道进行同步 - 添加各种事件 - x 用户相关 - x 角色相关 + - x 短信渠道配置 - 添加配置备份功能(菜单/系统参数/字典), csv方式 - 添加各种导入和导出功能 - 添加各种批量操作功能 diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index 6ce9cfdc..c2e6cff5 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -25,6 +25,11 @@ spring-boot-starter-data-mongodb true + + cn.bootx + mybatis-table-modify-mysql-boot-starter + provided + cn.bootx.platform common-mybatis-plus @@ -35,6 +40,7 @@ io.minio minio ${minio.version} + true diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java index f302b278..113361c5 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java @@ -10,6 +10,8 @@ public enum FileUploadTypeEnum { /** 本地存储 */ LOCAL, + /** 数据库存储 */ + JDBC, /** Mongo存储 */ MONGO, /** minio存储 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index e031fc6a..7e24f626 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -29,6 +29,9 @@ public class FileUploadProperties { /** 本地存储 */ private Local local = new Local(); + /** 数据库存储 */ + private JDBC jdbc = new JDBC(); + /** mongo存储配置 */ private Mongo mongo = new Mongo(); @@ -47,6 +50,18 @@ public class FileUploadProperties { } + /** + * 数据库存储 + */ + @Getter + @Setter + public static class JDBC { + + /** 是否以Base64方式进行存储 */ + private boolean base64 = false; + + } + /** * mongo存储配置 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index 076fcf9b..65c9ea25 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -46,6 +46,13 @@ public class FIleUpLoadController { return Res.ok(uploadService.upload(file, fileName)); } + @Operation(summary = "删除") + @DeleteMapping("/delete") + public ResResult delete(Long id){ + uploadService.delete(id); + return Res.ok(); + } + @Operation(summary = "获取文件预览地址") @GetMapping("getFilePreviewUrl") public ResResult getFilePreviewUrl(Long id) { diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java new file mode 100644 index 00000000..352843fe --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataManager.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.starter.file.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.starter.file.entity.JdbcFileData; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2023/8/5 + */ +@Repository +public class JdbcFileDataManager extends BaseManager { +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java new file mode 100644 index 00000000..61a6deca --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dao/JdbcFileDataMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.starter.file.dao; + +import cn.bootx.platform.starter.file.entity.JdbcFileData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * @author xxm + * @since 2023/8/5 + */ +@Mapper +public interface JdbcFileDataMapper extends BaseMapper { +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java new file mode 100644 index 00000000..3a731321 --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java @@ -0,0 +1,32 @@ +package cn.bootx.platform.starter.file.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbColumn; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; +import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; +import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 数据库存储上传的文件数据 + * @author xxm + * @since 2023/8/5 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@DbTable(comment = "上传文件数据") +@TableName("starter_file_data") +public class JdbcFileData extends MpIdEntity { + + @DbColumn(comment = "base64方式存储") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) + private String base64; + + @DbColumn(comment = "base64方式存储") + @DbMySqlFieldType(MySqlFieldTypeEnum.LONGBLOB) + private byte[] data; +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 20344cc4..8e5c4cd8 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -87,6 +87,21 @@ public class FileUploadService { return uploadInfo.toDto(); } + /** + * 文件删除 + */ + @Transactional(rollbackFor = Exception.class) + public void delete(Long id){ + val uploadType = fileUploadProperties.getUploadType(); + UploadService uploadService = uploadServices.stream() + .filter(s -> s.enable(uploadType)) + .findFirst() + .orElseThrow(() -> new BizException("未找到该类的上传处理器")); + UpdateFileInfo updateFileInfo = updateFileManager.findById(id).orElseThrow(() -> new BizException("文件不存在")); + uploadService.delete(updateFileInfo); + updateFileManager.deleteById(updateFileInfo.getId()); + } + /** * 浏览 */ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java new file mode 100644 index 00000000..8e57479a --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/JdbcUploadService.java @@ -0,0 +1,117 @@ +package cn.bootx.platform.starter.file.service.impl; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.starter.file.dao.JdbcFileDataManager; +import cn.bootx.platform.starter.file.entity.JdbcFileData; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.io.IoUtil; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +/** + * 数据库存储上传文件 + * @author xxm + * @since 2023/8/5 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class JdbcUploadService implements UploadService { + private final JdbcFileDataManager jdbcFileDataManager; + + private final FileUploadProperties fileUploadProperties; + + /** + * 判断启用 + */ + @Override + public boolean enable(FileUploadTypeEnum type) { + return type==FileUploadTypeEnum.JDBC; + } + + /** + * 上传文件 + * + * @param file + * @param context + */ + @SneakyThrows + @Override + public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + JdbcFileData jdbcFileData; + byte[] bytes = file.getBytes(); + if (jdbc.isBase64()){ + jdbcFileData =new JdbcFileData().setBase64(Base64.encode(bytes)); + } else { + jdbcFileData =new JdbcFileData().setData(bytes); + } + jdbcFileDataManager.save(jdbcFileData); + return new UpdateFileInfo().setExternalStorageId(String.valueOf(jdbcFileData.getId())).setFileSize(file.getSize()); + } + + /** + * 预览文件 + */ + @SneakyThrows + @Override + public void preview(UpdateFileInfo updateFileInfo, HttpServletResponse response) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + JdbcFileData jdbcFileData = jdbcFileDataManager.findById(id) + .orElseThrow(DataNotExistException::new); + InputStream inputStream; + if (jdbc.isBase64()){ + inputStream = new ByteArrayInputStream(Base64.decode(jdbcFileData.getBase64())); + } else { + inputStream = new ByteArrayInputStream(jdbcFileData.getData()); + } + + // 获取响应输出流 + ServletOutputStream os = response.getOutputStream(); + IoUtil.copy(inputStream, os); + response.addHeader(HttpHeaders.CONTENT_DISPOSITION, updateFileInfo.getFileType()); + IoUtil.close(inputStream); + IoUtil.close(os); + + } + + /** + * 下载文件 + */ + @Override + public InputStream download(UpdateFileInfo updateFileInfo) { + FileUploadProperties.JDBC jdbc = fileUploadProperties.getJdbc(); + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + JdbcFileData jdbcFileData = jdbcFileDataManager.findById(id) + .orElseThrow(DataNotExistException::new); + if (jdbc.isBase64()){ + return new ByteArrayInputStream(Base64.decode(jdbcFileData.getBase64())); + } else { + return new ByteArrayInputStream(jdbcFileData.getData()); + } + } + + /** + * 删除文件 + */ + @Override + public void delete(UpdateFileInfo updateFileInfo) { + Long id = Long.valueOf(updateFileInfo.getExternalStorageId()); + jdbcFileDataManager.deleteById(id); + } +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java index 29825db5..09d1b195 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/MinioUploadService.java @@ -10,6 +10,7 @@ import io.minio.*; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -27,6 +28,7 @@ import java.util.Objects; */ @Slf4j @Service +@ConditionalOnMissingClass("io.minio.MinioClient") @RequiredArgsConstructor public class MinioUploadService implements UploadService { @@ -39,11 +41,11 @@ public class MinioUploadService implements UploadService { */ @Override public boolean enable(FileUploadTypeEnum type) { - boolean b = type == FileUploadTypeEnum.MINIO; - if (b) { + boolean initFlag = type == FileUploadTypeEnum.MINIO; + if (initFlag) { this.doInit(); } - return b; + return initFlag; } /** @@ -54,8 +56,7 @@ public class MinioUploadService implements UploadService { public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { FileUploadProperties.Minio minio = fileUploadProperties.getMinio(); PutObjectArgs putObjectArgs = PutObjectArgs.builder() - .bucket(minio.getBucket()) // bucket - // 必须传递 + .bucket(minio.getBucket()) // bucket必须传递 .contentType(file.getContentType()) .object(context.getFileId() + "." + context.getFileSuffix()) .stream(file.getInputStream(), file.getSize(), -1) // 文件内容 @@ -105,8 +106,7 @@ public class MinioUploadService implements UploadService { public void delete(UpdateFileInfo updateFileInfo) { FileUploadProperties.Minio minio = fileUploadProperties.getMinio(); client.removeObject(RemoveObjectArgs.builder() - .bucket(minio.getBucket()) // bucket - // 必须传递 + .bucket(minio.getBucket()) // bucket必须传递 .object(updateFileInfo.getExternalStorageId()) // 相对路径作为 key .build()); } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java new file mode 100644 index 00000000..a6e9ff8d --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java @@ -0,0 +1,53 @@ +package cn.bootx.platform.notice.controller; + +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.notice.core.sms.service.SmsChannelConfigService; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * + * @author xxm + * @since 2023/8/5 + */ +@Tag(name = "短信渠道配置") +@RestController +@RequestMapping("/sms/config") +@RequiredArgsConstructor +public class SmsChannelConfigController { + private final SmsChannelConfigService configService; + + @Operation(summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody SmsChannelConfigParam param) { + configService.add(param); + return Res.ok(); + } + + @Operation(summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody SmsChannelConfigParam param) { + configService.update(param); + return Res.ok(); + } + + @Operation(summary = "通过Code查询") + @GetMapping(value = "/findByCode") + public ResResult findByCode(String code) { + return Res.ok(configService.findByCode(code)); + } + + @Operation(summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll() { + return Res.ok(configService.findAll()); + } + +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java index e112cf03..3f607530 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsTemplateController.java @@ -21,7 +21,7 @@ import java.util.List; */ @Tag(name ="短信模板配置") @RestController -@RequestMapping("/sms") +@RequestMapping("/sms/template") @RequiredArgsConstructor public class SmsTemplateController { private final SmsTemplateService smsTemplateService; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java index cfe4b850..918a328d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/dao/SmsChannelConfigManager.java @@ -6,8 +6,22 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Optional; + @Slf4j @Service @RequiredArgsConstructor public class SmsChannelConfigManager extends BaseManager { + + + public boolean existsByCode(String code){ + return existedByField(SmsChannelConfig::getCode,code); + } + public boolean existsByCode(String code,Long id){ + return existedByField(SmsChannelConfig::getCode,code,id); + } + + public Optional findByCode(String code){ + return findByField(SmsChannelConfig::getCode,code); + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index 8bb2a90c..34733ab9 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -9,6 +9,8 @@ import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.notice.core.sms.convert.SmsChannelConfigConvert; import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +34,7 @@ public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction * @see SupplierType#name() */ @DbColumn(comment = "渠道类型编码") + @TableField(updateStrategy = FieldStrategy.NEVER) private String code; /** @@ -58,15 +61,19 @@ public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction /** 配置字符串 */ @DbMySqlFieldType(MySqlFieldTypeEnum.TEXT) - @DbColumn(comment = "状态") + @DbColumn(comment = "配置字符串") private String config; /** 图片 */ @DbColumn(comment = "图片") private Long image; + /** 排序 */ + @DbColumn(comment = "排序") + private Double sortNo; + /** 备注 */ - @DbColumn(comment = "状态") + @DbColumn(comment = "备注") private String remark; /** 创建对象 */ diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java similarity index 36% rename from bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java rename to bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java index a65ed398..a09096df 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java @@ -1,10 +1,17 @@ package cn.bootx.platform.notice.core.sms.service; import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.function.CollectorsFunction; import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.notice.core.sms.dao.SmsChannelConfigManager; import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import cn.bootx.platform.notice.event.sms.SmsChannelAddEvent; +import cn.bootx.platform.notice.event.sms.SmsChannelUpdateEvent; +import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.sms4j.aliyun.config.AlibabaConfig; @@ -21,88 +28,118 @@ import org.dromara.sms4j.tencent.config.TencentConfig; import org.dromara.sms4j.unisms.config.UniConfig; import org.dromara.sms4j.yunpian.config.YunpianConfig; import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @Slf4j @Service @RequiredArgsConstructor -public class SmsChannelService { +public class SmsChannelConfigService { - private final SmsChannelConfigManager smsChannelConfigManager; + private final SmsChannelConfigManager configManager; + + private final ApplicationEventPublisher eventPublisher; /** * 查询全部配置 */ - public List findAll(){ + public List findAll(){ // 遍历数据库 - Map map = smsChannelConfigManager.findAll() + Map map = configManager.findAll() .stream() .collect(Collectors.toMap(SmsChannelConfig::getCode, Function.identity(), CollectorsFunction::retainLatest)); return Arrays.stream(SupplierType.values()) .map(type-> Optional.ofNullable(map.get(type.name().toLowerCase())) .orElse(new SmsChannelConfig() .setCode(type.name().toLowerCase()) + .setSortNo(0.0) .setName(type.getName()))) + .sorted(Comparator.comparing(SmsChannelConfig::getSortNo)) + .map(SmsChannelConfig::toDto) .collect(Collectors.toList()); } /** * 添加 */ - public void add(){ - + public void add(SmsChannelConfigParam param){ + SmsChannelConfig channelConfig = SmsChannelConfig.init(param); + // 编码不能重复 + if (configManager.existsByCode(param.getCode())) { + throw new BizException("编码已存在"); + } + configManager.save(channelConfig); + this.initChannelConfig(channelConfig); + eventPublisher.publishEvent(new SmsChannelAddEvent(this,channelConfig.toDto())); } /** * 更新 */ - public void update(){ + public void update(SmsChannelConfigParam param){ + SmsChannelConfig channelConfig = configManager.findById(param.getId()) + .orElseThrow(DataNotExistException::new); + // 编码不能重复 + if (configManager.existsByCode(param.getCode(), param.getId())) { + throw new BizException("编码已存在"); + } + BeanUtil.copyProperties(param, channelConfig, CopyOptions.create().ignoreNullValue()); + configManager.updateById(channelConfig); + this.initChannelConfig(channelConfig); + eventPublisher.publishEvent(new SmsChannelUpdateEvent(this,channelConfig.toDto())); } /** - * 启动成功初始化 + * 根据创查询 */ - @EventListener(WebServerInitializedEvent.class) - public void init(){ + public SmsChannelConfigDto findByCode(String code) { + return configManager.findByCode(code).map(SmsChannelConfig::toDto) + .orElseThrow(DataNotExistException::new); + } - List smsChannelConfigs = smsChannelConfigManager.findAll(); + /** + * 启动成功后初始化所有的短信通道配置 + */ + @EventListener(WebServerInitializedEvent.class) + public void initChannelConfig(){ + List smsChannelConfigs = configManager.findAll(); + smsChannelConfigs.forEach(this::initChannelConfig); + } - for (SmsChannelConfig channelConfig : smsChannelConfigs) { - SupplierType supplierType = getSupplierType(channelConfig.getCode()); - String config = channelConfig.getConfig(); - if (supplierType == SupplierType.ALIBABA) { - SupplierFactory.setAlibabaConfig(JacksonUtil.toBean(config,AlibabaConfig.class)); - } else if (supplierType == SupplierType.HUAWEI) { - SupplierFactory.setHuaweiConfig(JacksonUtil.toBean(config,HuaweiConfig.class)); - } else if (supplierType == SupplierType.UNI_SMS) { - SupplierFactory.setUniConfig(JacksonUtil.toBean(config,UniConfig.class)); - } else if (supplierType == SupplierType.TENCENT) { - SupplierFactory.setTencentConfig(JacksonUtil.toBean(config,TencentConfig.class)); - } else if (supplierType == SupplierType.YUNPIAN) { - SupplierFactory.setYunpianConfig(JacksonUtil.toBean(config,YunpianConfig.class)); - } else if (supplierType == SupplierType.JD_CLOUD) { - SupplierFactory.setJdCloudConfig(JacksonUtil.toBean(config,JdCloudConfig.class)); - } else if (supplierType == SupplierType.CLOOPEN) { - SupplierFactory.setCloopenConfig(JacksonUtil.toBean(config,CloopenConfig.class)); - } else if (supplierType == SupplierType.EMAY) { - SupplierFactory.setEmayConfig(JacksonUtil.toBean(config,EmayConfig.class)); - } else if (supplierType == SupplierType.CTYUN) { - SupplierFactory.setCtyunConfig(JacksonUtil.toBean(config,CtyunConfig.class)); - } else if (supplierType == SupplierType.NETEASE) { - SupplierFactory.setNeteaseConfig(JacksonUtil.toBean(config,NeteaseConfig.class)); - } else { - throw new SmsBlendException("短信加载失败！请检查配置类型."); - } + /** + * 启动成功后初始化所有的短信通道配置 + */ + public void initChannelConfig(SmsChannelConfig channelConfig){ + SupplierType supplierType = getSupplierType(channelConfig.getCode()); + String config = channelConfig.getConfig(); + if (supplierType == SupplierType.ALIBABA) { + SupplierFactory.setAlibabaConfig(JacksonUtil.toBean(config,AlibabaConfig.class)); + } else if (supplierType == SupplierType.HUAWEI) { + SupplierFactory.setHuaweiConfig(JacksonUtil.toBean(config,HuaweiConfig.class)); + } else if (supplierType == SupplierType.UNI_SMS) { + SupplierFactory.setUniConfig(JacksonUtil.toBean(config,UniConfig.class)); + } else if (supplierType == SupplierType.TENCENT) { + SupplierFactory.setTencentConfig(JacksonUtil.toBean(config,TencentConfig.class)); + } else if (supplierType == SupplierType.YUNPIAN) { + SupplierFactory.setYunpianConfig(JacksonUtil.toBean(config,YunpianConfig.class)); + } else if (supplierType == SupplierType.JD_CLOUD) { + SupplierFactory.setJdCloudConfig(JacksonUtil.toBean(config,JdCloudConfig.class)); + } else if (supplierType == SupplierType.CLOOPEN) { + SupplierFactory.setCloopenConfig(JacksonUtil.toBean(config,CloopenConfig.class)); + } else if (supplierType == SupplierType.EMAY) { + SupplierFactory.setEmayConfig(JacksonUtil.toBean(config,EmayConfig.class)); + } else if (supplierType == SupplierType.CTYUN) { + SupplierFactory.setCtyunConfig(JacksonUtil.toBean(config,CtyunConfig.class)); + } else if (supplierType == SupplierType.NETEASE) { + SupplierFactory.setNeteaseConfig(JacksonUtil.toBean(config,NeteaseConfig.class)); + } else { + throw new SmsBlendException("短信加载失败！请检查配置类型."); } - } /** diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java index 34a18633..a837f6ad 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java @@ -29,6 +29,8 @@ public class SmsChannelConfigDto extends BaseDto { private String accessSecret; @Schema(description = "配置") private String config; + @Schema(description = "排序") + private Double sortNo; @Schema(description = "备注") private String remark; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java new file mode 100644 index 00000000..dcbedc55 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelAddEvent.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.notice.event.sms; + +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信渠道添加事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelAddEvent extends ApplicationEvent { + private final SmsChannelConfigDto channelConfig; + + public SmsChannelAddEvent(Object source, SmsChannelConfigDto channelConfig) { + super(source); + this.channelConfig = channelConfig; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java new file mode 100644 index 00000000..81261da4 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelDisableEnableEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.notice.event.sms; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信通道停用事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelDisableEnableEvent extends ApplicationEvent { + private final String code; + + public SmsChannelDisableEnableEvent(Object source, String code) { + super(source); + this.code = code; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java new file mode 100644 index 00000000..21fd75b8 --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelEnableEvent.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.notice.event.sms; + +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信通道启用事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelEnableEvent extends ApplicationEvent { + private final String code; + + public SmsChannelEnableEvent(Object source, String code) { + super(source); + this.code = code; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java new file mode 100644 index 00000000..44b2102c --- /dev/null +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/event/sms/SmsChannelUpdateEvent.java @@ -0,0 +1,20 @@ +package cn.bootx.platform.notice.event.sms; + +import cn.bootx.platform.notice.dto.sms.SmsChannelConfigDto; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +/** + * 短信渠道更新事件 + * @author xxm + * @since 2023/8/5 + */ +@Getter +public class SmsChannelUpdateEvent extends ApplicationEvent { + private final SmsChannelConfigDto channelConfig; + + public SmsChannelUpdateEvent(Object source, SmsChannelConfigDto channelConfig) { + super(source); + this.channelConfig = channelConfig; + } +} diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java index 8b360d4a..960b7019 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/param/sms/SmsChannelConfigParam.java @@ -29,6 +29,8 @@ public class SmsChannelConfigParam { private String accessSecret; @Schema(description = "图片") private Long image; + @Schema(description = "排序") + private Double sortNo; @Schema(description = "配置") private String config; @Schema(description = "备注") diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index 9ea57f24..de9f6e58 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -75,6 +75,13 @@ common-starter-monitor + + + io.minio + minio + ${minio.version} + + diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 9eaaf517..7eaab83b 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -1,6 +1,9 @@ server: port: 9999 spring: +# profiles: +# include: +# - bootx-dev datasource: dynamic: primary: master @@ -201,7 +204,7 @@ bootx: search-type: cache # 文件上传 file-upload: - upload-type: local + upload-type: jdbc server-url: http://127.0.0.1:8080 local: local-path: /data/file -- Gitee From 1cd297e85ed68230525ef65cf37bb31309eaf9d6 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Mon, 7 Aug 2023 17:03:05 +0800 Subject: [PATCH 14/35] =?UTF-8?q?feat=20=E7=9F=AD=E4=BF=A1=E5=88=86?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmsChannelConfigController.java | 15 +- .../core/sms/entity/SmsChannelConfig.java | 4 + .../sms/service/SmsChannelConfigService.java | 155 ++++++++++++++---- .../notice/dto/sms/SmsChannelConfigDto.java | 2 + 4 files changed, 140 insertions(+), 36 deletions(-) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java index a6e9ff8d..5ed30259 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SmsChannelConfigController.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @@ -26,18 +27,24 @@ public class SmsChannelConfigController { @Operation(summary = "添加") @PostMapping(value = "/add") - public ResResult add(@RequestBody SmsChannelConfigParam param) { - configService.add(param); + public ResResult add(@RequestBody Map map) { + configService.add(map); return Res.ok(); } @Operation(summary = "修改") @PostMapping(value = "/update") - public ResResult update(@RequestBody SmsChannelConfigParam param) { - configService.update(param); + public ResResult update(@RequestBody Map map) { + configService.update(map); return Res.ok(); } + @Operation(summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id) { + return Res.ok(configService.findById(id)); + } + @Operation(summary = "通过Code查询") @GetMapping(value = "/findByCode") public ResResult findByCode(String code) { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index 34733ab9..aeb73cf7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -17,6 +17,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.dromara.sms4j.provider.enumerate.SupplierType; +import static com.baomidou.mybatisplus.annotation.FieldStrategy.IGNORED; + /** * 短信渠道配置 * @author xxm @@ -62,9 +64,11 @@ public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction /** 配置字符串 */ @DbMySqlFieldType(MySqlFieldTypeEnum.TEXT) @DbColumn(comment = "配置字符串") + @TableField(updateStrategy = IGNORED) private String config; /** 图片 */ + @TableField(updateStrategy = IGNORED) @DbColumn(comment = "图片") private Long image; diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java index a09096df..8720228d 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/service/SmsChannelConfigService.java @@ -3,6 +3,7 @@ package cn.bootx.platform.notice.core.sms.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.function.CollectorsFunction; +import cn.bootx.platform.common.core.util.CollUtil; import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.notice.core.sms.dao.SmsChannelConfigManager; import cn.bootx.platform.notice.core.sms.entity.SmsChannelConfig; @@ -12,9 +13,12 @@ import cn.bootx.platform.notice.event.sms.SmsChannelUpdateEvent; import cn.bootx.platform.notice.param.sms.SmsChannelConfigParam; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import lombok.val; import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.api.universal.SupplierConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig; import org.dromara.sms4j.comm.exception.SmsBlendException; import org.dromara.sms4j.core.config.SupplierFactory; @@ -31,6 +35,7 @@ import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.function.Function; @@ -45,34 +50,19 @@ public class SmsChannelConfigService { private final ApplicationEventPublisher eventPublisher; - /** - * 查询全部配置 - */ - public List findAll(){ - // 遍历数据库 - Map map = configManager.findAll() - .stream() - .collect(Collectors.toMap(SmsChannelConfig::getCode, Function.identity(), CollectorsFunction::retainLatest)); - return Arrays.stream(SupplierType.values()) - .map(type-> Optional.ofNullable(map.get(type.name().toLowerCase())) - .orElse(new SmsChannelConfig() - .setCode(type.name().toLowerCase()) - .setSortNo(0.0) - .setName(type.getName()))) - .sorted(Comparator.comparing(SmsChannelConfig::getSortNo)) - .map(SmsChannelConfig::toDto) - .collect(Collectors.toList()); - } - /** * 添加 */ - public void add(SmsChannelConfigParam param){ + @Transactional(rollbackFor = Exception.class) + public void add(Map map){ + SmsChannelConfigParam param = BeanUtil.toBean(map, SmsChannelConfigParam.class); SmsChannelConfig channelConfig = SmsChannelConfig.init(param); // 编码不能重复 if (configManager.existsByCode(param.getCode())) { throw new BizException("编码已存在"); } + String supplierConfig = getSupplierConfig(channelConfig, map); + channelConfig.setConfig(supplierConfig); configManager.save(channelConfig); this.initChannelConfig(channelConfig); eventPublisher.publishEvent(new SmsChannelAddEvent(this,channelConfig.toDto())); @@ -81,7 +71,9 @@ public class SmsChannelConfigService { /** * 更新 */ - public void update(SmsChannelConfigParam param){ + @Transactional(rollbackFor = Exception.class) + public void update(Map map){ + SmsChannelConfigParam param = BeanUtil.toBean(map, SmsChannelConfigParam.class); SmsChannelConfig channelConfig = configManager.findById(param.getId()) .orElseThrow(DataNotExistException::new); // 编码不能重复 @@ -89,13 +81,43 @@ public class SmsChannelConfigService { throw new BizException("编码已存在"); } BeanUtil.copyProperties(param, channelConfig, CopyOptions.create().ignoreNullValue()); + String supplierConfig = getSupplierConfig(channelConfig, map); + channelConfig.setConfig(supplierConfig); configManager.updateById(channelConfig); this.initChannelConfig(channelConfig); eventPublisher.publishEvent(new SmsChannelUpdateEvent(this,channelConfig.toDto())); } + /** - * 根据创查询 + * 查询全部配置 + */ + public List findAll(){ + // 遍历数据库 + Map map = configManager.findAll() + .stream() + .collect(Collectors.toMap(SmsChannelConfig::getCode, Function.identity(), CollectorsFunction::retainLatest)); + return Arrays.stream(SupplierType.values()) + .map(type-> Optional.ofNullable(map.get(type.name().toLowerCase())) + .orElse(new SmsChannelConfig() + .setCode(type.name().toLowerCase()) + .setSortNo(0.0) + .setName(type.getName()))) + .sorted(Comparator.comparing(SmsChannelConfig::getSortNo)) + .map(SmsChannelConfig::toDto) + .collect(Collectors.toList()); + } + + /** + * 根据ID查询 + */ + public SmsChannelConfigDto findById(Long id) { + return configManager.findById(id).map(SmsChannelConfig::toDto) + .orElseThrow(DataNotExistException::new); + } + + /** + * 根据code查询 */ public SmsChannelConfigDto findByCode(String code) { return configManager.findByCode(code).map(SmsChannelConfig::toDto) @@ -117,29 +139,98 @@ public class SmsChannelConfigService { public void initChannelConfig(SmsChannelConfig channelConfig){ SupplierType supplierType = getSupplierType(channelConfig.getCode()); String config = channelConfig.getConfig(); + if (StrUtil.isBlank(config)){ + return; + } + SupplierConfig bean; + if (supplierType == SupplierType.ALIBABA) { + bean = JacksonUtil.toBean(config, AlibabaConfig.class); + } else if (supplierType == SupplierType.HUAWEI) { + bean = JacksonUtil.toBean(config, HuaweiConfig.class); + } else if (supplierType == SupplierType.UNI_SMS) { + bean = JacksonUtil.toBean(config, UniConfig.class); + } else if (supplierType == SupplierType.TENCENT) { + bean = JacksonUtil.toBean(config, TencentConfig.class); + } else if (supplierType == SupplierType.YUNPIAN) { + bean = JacksonUtil.toBean(config, YunpianConfig.class); + } else if (supplierType == SupplierType.JD_CLOUD) { + bean = JacksonUtil.toBean(config, JdCloudConfig.class); + } else if (supplierType == SupplierType.CLOOPEN) { + bean = JacksonUtil.toBean(config, CloopenConfig.class); + } else if (supplierType == SupplierType.EMAY) { + bean = JacksonUtil.toBean(config, EmayConfig.class); + } else if (supplierType == SupplierType.CTYUN) { + bean = JacksonUtil.toBean(config, CtyunConfig.class); + } else if (supplierType == SupplierType.NETEASE) { + bean = JacksonUtil.toBean(config, NeteaseConfig.class); + } else { + throw new SmsBlendException("短信加载失败！请检查配置类型."); + } + SupplierFactory.setSupplierConfig(bean); + } + + /** + * 获取供应商配置的序列化 + */ + private String getSupplierConfig(SmsChannelConfig channelConfig, Map map){ + SupplierType supplierType = getSupplierType(channelConfig.getCode()); + if (CollUtil.isEmpty(map)){ + return null; + } if (supplierType == SupplierType.ALIBABA) { - SupplierFactory.setAlibabaConfig(JacksonUtil.toBean(config,AlibabaConfig.class)); + val bean = BeanUtil.toBean(map, AlibabaConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.HUAWEI) { - SupplierFactory.setHuaweiConfig(JacksonUtil.toBean(config,HuaweiConfig.class)); + val bean = BeanUtil.toBean(map, HuaweiConfig.class); + bean.setAppKey(channelConfig.getAccessKey()); + bean.setAppSecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.UNI_SMS) { - SupplierFactory.setUniConfig(JacksonUtil.toBean(config,UniConfig.class)); + val bean = BeanUtil.toBean(map, UniConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.TENCENT) { - SupplierFactory.setTencentConfig(JacksonUtil.toBean(config,TencentConfig.class)); + val bean = BeanUtil.toBean(map, TencentConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.YUNPIAN) { - SupplierFactory.setYunpianConfig(JacksonUtil.toBean(config,YunpianConfig.class)); + val bean = BeanUtil.toBean(map, YunpianConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.JD_CLOUD) { - SupplierFactory.setJdCloudConfig(JacksonUtil.toBean(config,JdCloudConfig.class)); + val bean = BeanUtil.toBean(map, JdCloudConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.CLOOPEN) { - SupplierFactory.setCloopenConfig(JacksonUtil.toBean(config,CloopenConfig.class)); + val bean = BeanUtil.toBean(map, CloopenConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.EMAY) { - SupplierFactory.setEmayConfig(JacksonUtil.toBean(config,EmayConfig.class)); + val bean = BeanUtil.toBean(map, EmayConfig.class); + bean.setAppId(channelConfig.getAccessKey()); + bean.setSecretKey(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.CTYUN) { - SupplierFactory.setCtyunConfig(JacksonUtil.toBean(config,CtyunConfig.class)); + val bean = BeanUtil.toBean(map, CtyunConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else if (supplierType == SupplierType.NETEASE) { - SupplierFactory.setNeteaseConfig(JacksonUtil.toBean(config,NeteaseConfig.class)); + val bean = BeanUtil.toBean(map, NeteaseConfig.class); + bean.setAccessKeyId(channelConfig.getAccessKey()); + bean.setAccessKeySecret(channelConfig.getAccessSecret()); + return JacksonUtil.toJson(bean); } else { throw new SmsBlendException("短信加载失败！请检查配置类型."); } + } /** diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java index a837f6ad..495b0659 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/dto/sms/SmsChannelConfigDto.java @@ -31,6 +31,8 @@ public class SmsChannelConfigDto extends BaseDto { private String config; @Schema(description = "排序") private Double sortNo; + @Schema(description = "图片") + private Long image; @Schema(description = "备注") private String remark; -- Gitee From 83b24924d5e002e7b42a69c5ad8e73bf31197c94 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Tue, 8 Aug 2023 14:05:12 +0800 Subject: [PATCH 15/35] =?UTF-8?q?feat=20=E7=9F=AD=E4=BF=A1=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E9=85=8D=E7=BD=AE=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 22 +++++++++++-------- .../notice/core/sms/entity/SmsTemplate.java | 13 +++-------- .../core/sms/service/SmsTemplateService.java | 1 - .../notice/dto/sms/SmsTemplateDto.java | 2 +- .../notice/param/sms/SmsTemplateParam.java | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index b9c66051..0211b068 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,26 +1,30 @@ ## 1.3.3 - x 终端可以设置新注册用户是否默认拥有该终端的权限 - x 增加一种数据库文件存储方式，作为轻量级功能进行使用 -- 添加短信配置, 集成SMS4J -- 添加短信模板功能, 可以与各短信商渠道进行同步 -- 添加各种事件 +- x 添加短信配置, 集成SMS4J +- x 添加各种事件 - x 用户相关 - x 角色相关 - x 短信渠道配置 -- 添加配置备份功能(菜单/系统参数/字典), csv方式 -- 添加各种导入和导出功能 -- 添加各种批量操作功能 -- 一键缓存同步和更新操作(字典/参数) - x vxe暗黑模式适配 -- MiniApp添加用户协议/隐私协议等(富文本) - x 删除工作流相关代码 - x 新版自定义表单集成(epic-designer尚处于测试版) -- 导入数据支持选择: 跳过, 覆盖, 报错 +## 1.3.4 +- MiniApp添加用户协议/隐私协议等(富文本) +- 小程序工单功能 +- 小程序用户反馈功能 +- 小程序 ## 1.3.x - PostgreSQL 数据库适配 +- 添加短信模板功能, 可以与各短信商渠道进行同步 - 优化异常类,将各种异常类进行拆分出来 - 优化参数校验, 将各种入参进行校验 - 代码生成模板支持配置 - 代码生成支持预览 - Sql查询功能 - 支持预览编辑完成的富文本 +- 添加配置备份功能(菜单/系统参数/字典), csv方式 +- 添加各种导入和导出功能 +- 导入数据支持选择: 跳过, 覆盖, 报错 +- 添加各种批量操作功能 +- 一键缓存同步和更新操作(字典/参数) diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java index 49254156..38b6fcfc 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsTemplate.java @@ -1,18 +1,11 @@ package cn.bootx.platform.notice.core.sms.entity; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDate; -import java.time.LocalTime; - import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; - -import com.baomidou.mybatisplus.annotation.TableName; +import cn.bootx.platform.notice.core.sms.convert.SmsTemplateConvert; import cn.bootx.platform.notice.dto.sms.SmsTemplateDto; import cn.bootx.platform.notice.param.sms.SmsTemplateParam; -import cn.bootx.platform.notice.core.sms.convert.SmsTemplateConvert; - +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -30,7 +23,7 @@ public class SmsTemplate extends MpBaseEntity implements EntityBaseFunction Date: Tue, 8 Aug 2023 15:42:12 +0800 Subject: [PATCH 16/35] =?UTF-8?q?build=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config/sql/bootx-platform.sql | 374 ++++++++---------- _doc/Task.md | 3 +- ...release.sql => V1.3.3_230808__release.sql} | 374 ++++++++---------- 3 files changed, 340 insertions(+), 411 deletions(-) rename bootx-start/src/main/resources/db/migration/{V1.3.1_230607__release.sql => V1.3.3_230808__release.sql} (92%) diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql index 0fb97592..73508a3a 100644 --- a/_config/sql/bootx-platform.sql +++ b/_config/sql/bootx-platform.sql @@ -2,13 +2,11 @@ Navicat Premium Data Transfer Source Server Type : MySQL - Source Server Version : 50735 Target Server Type : MySQL - Target Server Version : 50735 File Encoding : 65001 - Date: 07/06/2023 15:15:39 + Date: 08/08/2023 15:09:13 */ SET NAMES utf8mb4; @@ -3383,9 +3381,9 @@ CREATE TABLE `base_dict` ( `group_tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类标签', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3396,7 +3394,7 @@ CREATE TABLE `base_dict` ( -- ---------------------------- INSERT INTO `base_dict` VALUES (1422929378374828033, 'Sex', '性别', b'1', '基础属性', '性别', 0, '2021-08-04 22:36:15', 1399985191002447872, '2022-05-11 19:48:40', 0, 6); INSERT INTO `base_dict` VALUES (1425744045414772737, 'MenuType', '菜单类型', b'1', '系统属性', '菜单类型', 0, '2021-08-12 17:00:44', 1399985191002447872, '2022-05-11 19:48:44', 0, 4); -INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', NULL, '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); +INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', '基础属性', '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); INSERT INTO `base_dict` VALUES (1435829999592759296, 'UserStatusCode', '用户状态码', b'1', '系统属性', '用户状态码', 1399985191002447872, '2021-09-09 12:58:43', 1399985191002447872, '2022-05-11 19:48:56', 0, 2); INSERT INTO `base_dict` VALUES (1435838066191458304, 'LogBusinessType', '业务操作类型', b'1', '系统属性', '操作日志记录的业务操作类型', 1399985191002447872, '2021-09-09 13:30:46', 1399985191002447872, '2022-05-11 19:49:00', 0, 2); INSERT INTO `base_dict` VALUES (1438078864509317120, 'MailSecurityCode', '邮箱安全方式编码', b'1', '消息服务', '邮箱安全方式编码', 1399985191002447872, '2021-09-15 17:54:54', 1399985191002447872, '2022-05-11 19:49:06', 0, 2); @@ -3404,28 +3402,12 @@ INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消 INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', b'1', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', b'1', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', b'1', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); -INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', b'1', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); -INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', b'1', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); -INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', b'1', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); -INSERT INTO `base_dict` VALUES (1502624342339448832, 'WalletOperation', '钱包日志操作类型', b'1', NULL, '', 1399985191002447872, '2022-03-12 20:35:35', 1399985191002447872, '2022-03-12 20:35:35', 1, 0); -INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', b'1', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); -INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', b'1', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); -INSERT INTO `base_dict` VALUES (1503340128037212160, 'VoucherStatus', '储值卡状态', b'1', '支付服务', '储值卡状态', 1399985191002447872, '2022-03-14 19:59:52', 1399985191002447872, '2022-05-11 19:47:12', 0, 1); -INSERT INTO `base_dict` VALUES (1524356168611188736, 'input', '手工输入', b'1', '商品服务', '', 1399985191002447872, '2022-05-11 19:50:06', 1399985191002447872, '2022-05-11 19:50:06', 1, 0); -INSERT INTO `base_dict` VALUES (1524356376518643712, 'GoodsParamType', '参数类型', b'1', '商品服务', '列表/手动输入', 1399985191002447872, '2022-05-11 19:50:56', 1399985191002447872, '2022-05-14 23:05:41', 0, 1); -INSERT INTO `base_dict` VALUES (1546757092010078208, 'PayNotifyProcess', '支付回调处理状态', b'1', '支付服务', '成功/忽略/失败', 1399985191002447872, '2022-07-12 15:23:23', 1399985191002447872, '2022-07-12 15:23:53', 0, 1); INSERT INTO `base_dict` VALUES (1556996322223968256, 'WeChatMediaType', '微信媒体类型', b'1', '微信', '微信媒体类型', 1399985191002447872, '2022-08-09 21:30:25', 1399985191002447872, '2022-08-09 21:30:26', 0, 0); INSERT INTO `base_dict` VALUES (1561003021674987520, 'SiteMessageReceive', '消息接收类型', b'1', '站内信', '站内信接收类型', 1399985191002447872, '2022-08-20 22:51:37', 1399985191002447872, '2022-08-20 22:51:37', 0, 0); INSERT INTO `base_dict` VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', b'1', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); -INSERT INTO `base_dict` VALUES (1562696107020230656, 'BpmModelPublish', '工作流模型发布状态', b'1', '工作流', '工作流模型发布状态', 1399985191002447872, '2022-08-25 14:59:20', 1399985191002447872, '2022-08-25 15:27:55', 0, 1); -INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工作流处理人分配类型', b'1', '工作流', '流程任务处理人分配类型', 1399985191002447872, '2022-08-26 16:40:34', 1399985191002447872, '2022-08-26 16:40:53', 0, 1); -INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', b'1', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1); -INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', b'1', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1); -INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', b'1', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1); INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', b'1', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1399985191002447872, '2022-12-09 22:09:25', 0, 3); INSERT INTO `base_dict` VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); +INSERT INTO `base_dict` VALUES (1688742690398617600, 'smsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-08 10:43:27', 0, 0); -- ---------------------------- -- Table structure for base_dict_item @@ -3441,9 +3423,9 @@ CREATE TABLE `base_dict_item` ( `sort_no` double(8, 2) NOT NULL COMMENT '排序', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, @@ -3497,85 +3479,11 @@ INSERT INTO `base_dict_item` VALUES (1496027369796743168, 1496024933900169216, ' INSERT INTO `base_dict_item` VALUES (1496027408141070336, 1496024933900169216, 'Political', '11', '台盟盟员', b'1', 11.00, '', 1399985191002447872, '2022-02-22 15:41:44', 1399985191002447872, '2022-02-22 15:41:44', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027456849522688, 1496024933900169216, 'Political', '12', '无党派人士', b'1', 12.00, '', 1399985191002447872, '2022-02-22 15:41:55', 1399985191002447872, '2022-02-22 15:41:55', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027516639326208, 1496024933900169216, 'Political', '13', '群众', b'1', 13.00, '', 1399985191002447872, '2022-02-22 15:42:09', 1399985191002447872, '2022-02-22 15:42:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780500696539136, 1496722894707728384, 'PayChannel', '1', '支付宝', b'1', 1.00, '', 1399985191002447872, '2022-02-24 17:34:15', 1399985191002447872, '2022-03-08 11:02:59', 0, 3); -INSERT INTO `base_dict_item` VALUES (1496780576818962432, 1496722894707728384, 'PayChannel', '2', '微信', b'1', 2.00, '', 1399985191002447872, '2022-02-24 17:34:33', 1399985191002447872, '2022-03-08 11:04:00', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496780712492113920, 1496723207565058048, 'PayWay', '1', 'wap支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:05', 1399985191002447872, '2022-02-24 17:35:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780757647990784, 1496723207565058048, 'PayWay', '2', '应用支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:16', 1399985191002447872, '2022-02-24 17:35:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780799691694080, 1496723207565058048, 'PayWay', '3', 'web支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:26', 1399985191002447872, '2022-02-24 17:35:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780838451257344, 1496723207565058048, 'PayWay', '4', '二维码扫码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:35', 1399985191002447872, '2022-02-24 17:35:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780876388737024, 1496723207565058048, 'PayWay', '5', '付款码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:44', 1399985191002447872, '2022-02-24 17:35:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141630803566592, 1497140849954185216, 'PayStatus', '3', '支付取消', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:15', 1399985191002447872, '2022-02-25 17:29:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141652379066368, 1497140849954185216, 'PayStatus', '2', '失败', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:20', 1399985191002447872, '2022-02-25 17:29:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141681915355136, 1497140849954185216, 'PayStatus', '1', '成功', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:27', 1399985191002447872, '2022-02-25 17:29:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141712743489536, 1497140849954185216, 'PayStatus', '0', '支付中', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:35', 1399985191002447872, '2022-02-25 17:29:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497506810439892992, 1497140849954185216, 'PayStatus', '4', '部分退款', b'1', 1.00, '部分退款', 1399985191002447872, '2022-02-26 17:40:21', 1399985191002447872, '2022-03-04 21:22:46', 0, 7); -INSERT INTO `base_dict_item` VALUES (1499367587857694720, 1497140849954185216, 'PayStatus', '5', '已退款', b'1', 2.00, '完全退款', 1399985191002447872, '2022-03-03 20:54:25', 1399985191002447872, '2022-03-04 21:22:49', 0, 3); -INSERT INTO `base_dict_item` VALUES (1501030031432847360, 1496722894707728384, 'PayChannel', '3', '云闪付', b'1', 3.00, '', 1399985191002447872, '2022-03-08 11:00:22', 1399985191002447872, '2022-03-08 11:04:07', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030073489133568, 1496722894707728384, 'PayChannel', '4', '现金', b'1', 4.00, '', 1399985191002447872, '2022-03-08 11:00:32', 1399985191002447872, '2022-03-08 11:04:10', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030108314439680, 1496722894707728384, 'PayChannel', '5', '钱包', b'1', 5.00, '', 1399985191002447872, '2022-03-08 11:00:40', 1399985191002447872, '2022-03-08 11:04:14', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501031490513768448, 1501031423232937984, 'AsyncPayChannel', '3', '云闪付', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:10', 1399985191002447872, '2022-03-08 11:06:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031518208757760, 1501031423232937984, 'AsyncPayChannel', '2', '微信', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:16', 1399985191002447872, '2022-03-08 11:06:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031544360243200, 1501031423232937984, 'AsyncPayChannel', '1', '支付宝', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:23', 1399985191002447872, '2022-03-08 11:06:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276841057005568, 1502276739978473472, 'WalletStatus', '2', '禁用', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:45', 1399985191002447872, '2022-03-11 21:34:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276862108217344, 1502276739978473472, 'WalletStatus', '1', '正常', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:50', 1399985191002447872, '2022-03-11 21:34:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624716257456128, 1502624515799085056, 'WalletLogType', '1', '开通', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:04', 1399985191002447872, '2022-03-12 20:37:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624931978899456, 1502624515799085056, 'WalletLogType', '2', '主动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:56', 1399985191002447872, '2022-03-12 20:37:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624956209393664, 1502624515799085056, 'WalletLogType', '3', '自动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:02', 1399985191002447872, '2022-03-12 20:38:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625014719934464, 1502624515799085056, 'WalletLogType', '4', '余额变动', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:16', 1399985191002447872, '2022-03-12 20:38:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625053097816064, 1502624515799085056, 'WalletLogType', '5', '支付', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:25', 1399985191002447872, '2022-03-12 20:38:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625091639275520, 1502624515799085056, 'WalletLogType', '6', '系统扣除余额', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:34', 1399985191002447872, '2022-03-12 20:38:34', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625123725701120, 1502624515799085056, 'WalletLogType', '7', '退款', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:42', 1399985191002447872, '2022-03-12 20:38:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625783145787392, 1502624632392347648, 'WalletLogOperation', '1', '系统操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:19', 1399985191002447872, '2022-03-12 20:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625814837948416, 1502624632392347648, 'WalletLogOperation', '2', '管理员操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:26', 1399985191002447872, '2022-03-12 20:41:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625850355314688, 1502624632392347648, 'WalletLogOperation', '3', '用户操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:35', 1399985191002447872, '2022-03-12 20:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340241493135360, 1503340128037212160, 'VoucherStatus', '1', '启用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:19', 1399985191002447872, '2022-03-14 20:00:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340326645895168, 1503340128037212160, 'VoucherStatus', '2', '停用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:39', 1399985191002447872, '2022-03-14 20:00:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1505112357976612864, 1496722894707728384, 'PayChannel', '6', '储值卡', b'1', 0.00, '', 1399985191002447872, '2022-03-19 17:22:04', 1399985191002447872, '2022-03-19 17:22:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356452720758784, 1524356376518643712, 'GoodsParamType', 'input', '手工录入', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:14', 1399985191002447872, '2022-05-11 19:51:14', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356510157557760, 1524356376518643712, 'GoodsParamType', 'select', '列表选择', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:28', 1399985191002447872, '2022-05-11 19:51:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757293592522752, 1546757092010078208, 'PayNotifyProcess', '0', '失败', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:11', 1399985191002447872, '2022-07-12 15:24:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757327901929472, 1546757092010078208, 'PayNotifyProcess', '1', '成功', b'1', -1.00, '', 1399985191002447872, '2022-07-12 15:24:19', 1399985191002447872, '2022-07-12 15:31:38', 0, 2); -INSERT INTO `base_dict_item` VALUES (1546757375637303296, 1546757092010078208, 'PayNotifyProcess', '2', '忽略', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:30', 1399985191002447872, '2022-07-12 15:24:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996422006460416, 1556996322223968256, 'WeChatMediaType', 'news', '新闻', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:30:49', 1399985191002447872, '2022-08-09 21:30:49', 1, 0); -INSERT INTO `base_dict_item` VALUES (1556996472661069824, 1556996322223968256, 'WeChatMediaType', 'voice', '语音', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:01', 1399985191002447872, '2022-08-09 21:31:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996501417218048, 1556996322223968256, 'WeChatMediaType', 'image', '图片', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:08', 1399985191002447872, '2022-08-09 21:31:08', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996529565192192, 1556996322223968256, 'WeChatMediaType', 'video', '视频', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:15', 1399985191002447872, '2022-08-09 21:31:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1561003235710320640, 1561003189111603200, 'SiteMessageState', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:28', 1399985191002447872, '2022-08-20 22:52:28', 1, 0); -INSERT INTO `base_dict_item` VALUES (1561003279322693632, 1561003189111603200, 'SiteMessageState', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:38', 1399985191002447872, '2022-08-20 22:52:39', 1, 0); INSERT INTO `base_dict_item` VALUES (1561003368762032128, 1561003021674987520, 'SiteMessageReceive', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:00', 1399985191002447872, '2022-08-20 22:53:00', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003399778910208, 1561003021674987520, 'SiteMessageReceive', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:07', 1399985191002447872, '2022-08-20 22:53:24', 0, 1); INSERT INTO `base_dict_item` VALUES (1561003539772194816, 1561003189111603200, 'SiteMessageState', 'sent', '已发送', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:41', 1399985191002447872, '2022-08-20 22:53:41', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003575608328192, 1561003189111603200, 'SiteMessageState', 'cancel', '撤销', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:49', 1399985191002447872, '2022-08-20 22:53:49', 0, 0); INSERT INTO `base_dict_item` VALUES (1561245469535080448, 1561003189111603200, 'SiteMessageState', 'draft', '草稿', b'1', 0.00, '', 1399985191002447872, '2022-08-21 14:55:01', 1399985191002447872, '2022-08-21 14:55:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696390043475968, 1562696107020230656, 'BpmModelPublish', 'published', '已发布', b'1', 0.00, '', 1399985191002447872, '2022-08-25 15:00:28', 1399985191002447872, '2022-08-25 15:00:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696420561231872, 1562696107020230656, 'BpmModelPublish', 'unpublished', '未发布', b'1', 0.00, '未上传xml文档', 1399985191002447872, '2022-08-25 15:00:35', 1399985191002447872, '2022-08-25 15:28:09', 0, 1); -INSERT INTO `base_dict_item` VALUES (1562703450588028928, 1562696107020230656, 'BpmModelPublish', 'unpublishedXml', '未发布(已上传BPMN)', b'1', 0.00, '有xml文档', 1399985191002447872, '2022-08-25 15:28:31', 1399985191002447872, '2022-08-25 15:34:45', 0, 1); -INSERT INTO `base_dict_item` VALUES (1563087300157747200, 1563083969989423104, 'BpmTaskAssignType', 'user', '用户', b'1', 0.00, '', 1399985191002447872, '2022-08-26 16:53:48', 1399985191002447872, '2022-09-06 22:50:15', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091825981980672, 1567091641298386944, 'BpmTaskState', 'running', '处理中', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:21', 1399985191002447872, '2022-09-06 18:06:21', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091863017684992, 1567091641298386944, 'BpmTaskState', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:30', 1399985191002447872, '2022-09-06 18:06:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091902414782464, 1567091641298386944, 'BpmTaskState', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:39', 1399985191002447872, '2022-09-06 18:06:51', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091993569591296, 1567091641298386944, 'BpmTaskState', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:01', 1399985191002447872, '2022-09-06 18:07:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567092037261656064, 1567091641298386944, 'BpmTaskState', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:12', 1399985191002447872, '2022-09-06 18:07:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567092124226355200, 1567091641298386944, 'BpmTaskState', 'skip', '跳过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:32', 1399985191002447872, '2022-09-06 18:07:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163310103564288, 1563083969989423104, 'BpmTaskAssignType', 'userGroup', '用户组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:24', 1399985191002447872, '2022-09-06 22:50:24', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163343288897536, 1563083969989423104, 'BpmTaskAssignType', 'role', '角色', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:32', 1399985191002447872, '2022-09-06 22:50:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163380693700608, 1563083969989423104, 'BpmTaskAssignType', 'deptMember', '部门成员', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:41', 1399985191002447872, '2022-09-06 22:50:41', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163412960481280, 1563083969989423104, 'BpmTaskAssignType', 'deptLeader', '部门的负责人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:49', 1399985191002447872, '2022-09-06 22:50:49', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567175558888923136, 1563083969989423104, 'BpmTaskAssignType', 'roleGroup', '角色组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:39:05', 1399985191002447872, '2022-09-06 23:39:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567178994242002944, 1563083969989423104, 'BpmTaskAssignType', 'sponsor', '发起人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:52:44', 1399985191002447872, '2022-09-06 23:52:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567179143576002560, 1563083969989423104, 'BpmTaskAssignType', 'select', '用户手动选择', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:53:19', 1399985191002447872, '2022-09-07 00:01:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570343731634249728, 1570343684024705024, 'BpmTaskResult', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:16', 1399985191002447872, '2022-09-15 17:28:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343761636106240, 1570343684024705024, 'BpmTaskResult', 'notPass', '不通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:23', 1399985191002447872, '2022-09-15 17:28:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343788056027136, 1570343684024705024, 'BpmTaskResult', 'abstain', '弃权', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:29', 1399985191002447872, '2022-09-15 17:28:29', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343826018672640, 1570343684024705024, 'BpmTaskResult', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:38', 1399985191002447872, '2022-09-15 17:28:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343873737269248, 1570343684024705024, 'BpmTaskResult', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:50', 1399985191002447872, '2022-09-15 17:28:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343913918701568, 1570343684024705024, 'BpmTaskResult', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:59', 1399985191002447872, '2022-09-15 17:28:59', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570685888076120064, 1570343684024705024, 'BpmTaskResult', 'autoFinish', '自动完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 16:07:52', 1399985191002447872, '2022-09-16 16:08:02', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570764765255397376, 1570764395519111168, 'BpmInstanceState', 'running', '运行中', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:18', 1399985191002447872, '2022-12-09 22:15:46', 0, 2); -INSERT INTO `base_dict_item` VALUES (1570764802047832064, 1570764395519111168, 'BpmInstanceState', 'finish', '已完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:27', 1399985191002447872, '2022-09-16 21:21:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, 'BpmInstanceState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:35', 1399985191002447872, '2022-09-16 21:21:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0); INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', b'1', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1); INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0); INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0); @@ -3587,6 +3495,16 @@ INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, ' INSERT INTO `base_dict_item` VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'smsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'smsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'smsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'smsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'smsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'smsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'smsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'smsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'smsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'smsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); -- ---------------------------- -- Table structure for base_dynamic_data_source @@ -3605,9 +3523,9 @@ CREATE TABLE `base_dynamic_data_source` ( `db_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3628,9 +3546,9 @@ CREATE TABLE `base_dynamic_form` ( `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '表单内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3651,9 +3569,9 @@ CREATE TABLE `base_key_value` ( `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3677,9 +3595,9 @@ CREATE TABLE `base_param` ( `internal` bit(1) NOT NULL COMMENT '内置参数', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3692,7 +3610,7 @@ INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123' INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); -INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-07-09 21:42:21', 1399985191002447872, '2022-07-09 21:42:21', 0, 0); +INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '优先级高于配置文件内进行的配置', 1399985191002447872, '2022-07-09 21:42:21', 1414143554414059520, '2023-08-05 16:40:05', 0, 1); INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); -- ---------------------------- @@ -3753,9 +3671,9 @@ CREATE TABLE `base_query_sql` ( `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数', `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -3806,9 +3724,9 @@ CREATE TABLE `common_sequence_range` ( `range_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区间key', `range_value` bigint(20) NOT NULL COMMENT '区间开始值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3829,9 +3747,9 @@ CREATE TABLE `demo_data_encrypt` ( `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3853,9 +3771,9 @@ CREATE TABLE `demo_data_perm` ( `creator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者名称', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3882,9 +3800,9 @@ CREATE TABLE `demo_data_sensitive` ( `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮件', `other` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3906,14 +3824,14 @@ CREATE TABLE `demo_super_query` ( `age` int(5) NULL DEFAULT NULL COMMENT '年龄', `vip` bit(1) NULL DEFAULT NULL COMMENT '是否vip', `birthday` date NULL DEFAULT NULL COMMENT '生日', - `work_time` time(0) NULL DEFAULT NULL COMMENT '上班时间', - `registration_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `work_time` time NULL DEFAULT NULL COMMENT '上班时间', + `registration_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `political` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '政治面貌', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3933,29 +3851,30 @@ INSERT INTO `demo_super_query` VALUES (1496373512871284736, '刘备', 108, b'0', -- ---------------------------- DROP TABLE IF EXISTS `iam_client`; CREATE TABLE `iam_client` ( - `id` bigint(20) NOT NULL, + `id` bigint(20) NOT NULL COMMENT '主键', `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `system` bit(1) NOT NULL COMMENT '是否系统内置', `enable` bit(1) NOT NULL COMMENT '是否可用', `login_type_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联登录方式\r\n', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '删除标志', + `default_endow` bit(1) NULL DEFAULT NULL COMMENT '新注册的用户是否默认赋予该终端', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of iam_client -- ---------------------------- -INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, 0); -INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); -INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1399985191002447872, '2022-10-13 17:14:25', 1, 0); -INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, 0); +INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, b'0', NULL); +INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, b'0', NULL); +INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1414143554414059520, '2023-08-02 14:28:37', 2, b'0', b'1'); +INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, b'0', NULL); -- ---------------------------- -- Table structure for iam_data_scope @@ -3968,9 +3887,9 @@ CREATE TABLE `iam_data_scope` ( `type` int(4) NOT NULL COMMENT '类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4041,9 +3960,9 @@ CREATE TABLE `iam_dept` ( `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4083,9 +4002,9 @@ CREATE TABLE `iam_login_type` ( `enable` bit(1) NOT NULL COMMENT '是否可用', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4130,9 +4049,9 @@ CREATE TABLE `iam_perm_menu` ( `admin` bit(1) NOT NULL COMMENT '系统菜单', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4271,6 +4190,9 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); +INSERT INTO `iam_perm_menu` VALUES (1687369862646558720, 'adminv3', 1582275984849326080, '短信管理', 'Sms', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/notice/sms', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:48:20', 1414143554414059520, '2023-08-04 15:48:32', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370142234669056, 'adminv3', 1687369862646558720, '短信配置', 'SmsChannelConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/config/SmsChannelConfigList', NULL, '/notice/sms/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:26', 1414143554414059520, '2023-08-04 15:49:26', 0, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370277496778752, 'adminv3', 1687369862646558720, '短信模板', 'SmsTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/template/SmsTemplateList', NULL, '/notice/sms/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:59', 1414143554414059520, '2023-08-04 15:50:38', 1, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -4310,9 +4232,9 @@ CREATE TABLE `iam_role` ( `internal` bit(1) NOT NULL COMMENT '是否系统内置', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4407,14 +4329,14 @@ CREATE TABLE `iam_user_expand_info` ( `sex` int(4) NULL DEFAULT NULL COMMENT '性别', `birthday` date NULL DEFAULT NULL COMMENT '生日', `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '上次登录时间', - `current_login_time` datetime(0) NULL DEFAULT NULL COMMENT '本次登录时间', + `last_login_time` datetime NULL DEFAULT NULL COMMENT '上次登录时间', + `current_login_time` datetime NULL DEFAULT NULL COMMENT '本次登录时间', `initial_password` bit(1) NOT NULL COMMENT '是否初始密码', - `last_change_password_time` datetime(0) NULL DEFAULT NULL COMMENT '上次修改密码时间', + `last_change_password_time` datetime NULL DEFAULT NULL COMMENT '上次修改密码时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4446,12 +4368,12 @@ CREATE TABLE `iam_user_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', `source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册来源', `admin` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否超级管理员', - `register_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `register_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `status` tinyint(4) NOT NULL COMMENT '账号状态', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4499,9 +4421,9 @@ CREATE TABLE `iam_user_third` ( `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, @@ -4525,9 +4447,9 @@ CREATE TABLE `iam_user_third_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', `third_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '关联第三方平台的用户id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' @@ -4554,9 +4476,9 @@ CREATE TABLE `notice_mail_config` ( `activity` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `security_type` int(2) NULL DEFAULT NULL COMMENT '安全传输方式 1:plain 2:tls 3:ssl', `creator` bigint(18) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(18) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -4575,12 +4497,12 @@ CREATE TABLE `notice_message_template` ( `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板数据', - `type` int(11) NULL DEFAULT NULL COMMENT '模板类型', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4589,15 +4511,15 @@ CREATE TABLE `notice_message_template` ( -- ---------------------------- -- Records of notice_message_template -- ---------------------------- -INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', 1, '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', 0, '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', 0, '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); -INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', 0, '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', 0, '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); -INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); +INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', '1', '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', '0', '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', '0', '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); +INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', '0', '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', '0', '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); +INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); -- ---------------------------- -- Table structure for notice_site_message @@ -4609,15 +4531,15 @@ CREATE TABLE `notice_site_message` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容', `sender_id` bigint(20) NULL DEFAULT NULL COMMENT '发送者id', `sender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送者姓名', - `sender_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', + `sender_time` datetime NULL DEFAULT NULL COMMENT '发送时间', `receive_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型', `send_state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', - `efficient_time` datetime(0) NULL DEFAULT NULL COMMENT '截至有效期', - `cancel_time` datetime(0) NULL DEFAULT NULL COMMENT '撤回时间', + `efficient_time` datetime NULL DEFAULT NULL COMMENT '截至有效期', + `cancel_time` datetime NULL DEFAULT NULL COMMENT '撤回时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4636,9 +4558,9 @@ CREATE TABLE `notice_site_message_user` ( `message_id` bigint(20) NOT NULL COMMENT '消息id', `receive_id` bigint(20) NOT NULL COMMENT '接收者id', `have_read` bit(1) NOT NULL COMMENT '已读/未读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', + `read_time` datetime NULL DEFAULT NULL COMMENT '已读时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uni_receive_message`(`receive_id`, `message_id`) USING BTREE COMMENT '接收人和消息联合索引', @@ -4659,17 +4581,21 @@ INSERT INTO `notice_site_message_user` VALUES (1561379841968648192, 156136589480 DROP TABLE IF EXISTS `notice_sms_channel_config`; CREATE TABLE `notice_sms_channel_config` ( `id` bigint(20) NOT NULL COMMENT '主键', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道编码', - `signature` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信签名', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信ApiKey', - `api_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信Api秘钥', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型编码', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型名称', + `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessKey', + `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置字符串', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `access_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessSecret', + `image` bigint(20) NULL DEFAULT NULL COMMENT '图片', + `sort_no` double(10, 0) NULL DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信渠道配置' ROW_FORMAT = DYNAMIC; @@ -4692,9 +4618,9 @@ CREATE TABLE `notice_sms_config` ( `from_num` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, @@ -4707,6 +4633,29 @@ CREATE TABLE `notice_sms_config` ( -- Records of notice_sms_config -- ---------------------------- +-- ---------------------------- +-- Table structure for notice_sms_template +-- ---------------------------- +DROP TABLE IF EXISTS `notice_sms_template`; +CREATE TABLE `notice_sms_template` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `supplier_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `template_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板名称', + `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板内容', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL COMMENT '删除标志', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '短信模板配置' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of notice_sms_template +-- ---------------------------- + -- ---------------------------- -- Table structure for notice_wechat_config -- ---------------------------- @@ -4720,9 +4669,9 @@ CREATE TABLE `notice_wechat_config` ( `corp_secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4980,9 +4929,9 @@ CREATE TABLE `report_project_info` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', `index_image` bigint(20) NULL DEFAULT NULL COMMENT '预览图片id', @@ -5002,9 +4951,9 @@ CREATE TABLE `report_project_info_publish` ( `id` bigint(20) NOT NULL COMMENT '主键', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -5027,7 +4976,7 @@ CREATE TABLE `starter_audit_data_version` ( `change_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据更新内容', `version` int(10) NOT NULL COMMENT '版本', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据版本日志' ROW_FORMAT = DYNAMIC; @@ -5053,7 +5002,7 @@ CREATE TABLE `starter_audit_login_log` ( `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统', `browser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型', `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息', - `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间', + `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; @@ -5080,7 +5029,7 @@ CREATE TABLE `starter_audit_operate_log` ( `operate_return` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '返回参数', `success` bit(1) NULL DEFAULT NULL COMMENT '是否成功', `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误提示', - `operate_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间', + `operate_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; @@ -5130,6 +5079,21 @@ CREATE TABLE `starter_ding_robot_config` ( -- Records of starter_ding_robot_config -- ---------------------------- +-- ---------------------------- +-- Table structure for starter_file_data +-- ---------------------------- +DROP TABLE IF EXISTS `starter_file_data`; +CREATE TABLE `starter_file_data` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `base64` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'base64方式存储', + `data` longblob NULL COMMENT 'base64方式存储', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '上传文件数据' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of starter_file_data +-- ---------------------------- + -- ---------------------------- -- Table structure for starter_file_upload_info -- ---------------------------- @@ -5143,7 +5107,7 @@ CREATE TABLE `starter_file_upload_info` ( `file_size` bigint(20) NULL DEFAULT NULL COMMENT '文件大小', `external_storage_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部关联id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; @@ -5164,9 +5128,9 @@ CREATE TABLE `starter_quartz_job` ( `state` int(4) NULL DEFAULT NULL COMMENT '状态', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -5188,10 +5152,10 @@ CREATE TABLE `starter_quartz_job_log` ( `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器全限定名', `success` bit(1) NOT NULL COMMENT '是否执行成功', `error_message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', `duration` bigint(255) NULL DEFAULT NULL COMMENT '执行时长', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务执行日志' ROW_FORMAT = DYNAMIC; @@ -5230,7 +5194,7 @@ CREATE TABLE `starter_wx_fans` ( `id` bigint(20) NOT NULL, `openid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联OpenId', `subscribe_status` bit(1) NULL DEFAULT NULL COMMENT '订阅状态', - `subscribe_time` datetime(0) NULL DEFAULT NULL COMMENT '订阅时间', + `subscribe_time` datetime NULL DEFAULT NULL COMMENT '订阅时间', `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `sex` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别', `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语言', @@ -5257,9 +5221,9 @@ CREATE TABLE `starter_wx_menu` ( `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `publish` bit(1) NOT NULL COMMENT '是否发布', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -5285,9 +5249,9 @@ CREATE TABLE `starter_wx_template` ( `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板内容', `example` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示例', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `inx_`(`template_id`) USING BTREE COMMENT '模板id' diff --git a/_doc/Task.md b/_doc/Task.md index 0211b068..bc6b5885 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -13,7 +13,6 @@ - MiniApp添加用户协议/隐私协议等(富文本) - 小程序工单功能 - 小程序用户反馈功能 -- 小程序 ## 1.3.x - PostgreSQL 数据库适配 - 添加短信模板功能, 可以与各短信商渠道进行同步 @@ -28,3 +27,5 @@ - 导入数据支持选择: 跳过, 覆盖, 报错 - 添加各种批量操作功能 - 一键缓存同步和更新操作(字典/参数) +- 加密模块支持主键加密 +- Knife4j移植官方basic认证功能 diff --git a/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql b/bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql similarity index 92% rename from bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql rename to bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql index 0fb97592..73508a3a 100644 --- a/bootx-start/src/main/resources/db/migration/V1.3.1_230607__release.sql +++ b/bootx-start/src/main/resources/db/migration/V1.3.3_230808__release.sql @@ -2,13 +2,11 @@ Navicat Premium Data Transfer Source Server Type : MySQL - Source Server Version : 50735 Target Server Type : MySQL - Target Server Version : 50735 File Encoding : 65001 - Date: 07/06/2023 15:15:39 + Date: 08/08/2023 15:09:13 */ SET NAMES utf8mb4; @@ -3383,9 +3381,9 @@ CREATE TABLE `base_dict` ( `group_tag` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '分类标签', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3396,7 +3394,7 @@ CREATE TABLE `base_dict` ( -- ---------------------------- INSERT INTO `base_dict` VALUES (1422929378374828033, 'Sex', '性别', b'1', '基础属性', '性别', 0, '2021-08-04 22:36:15', 1399985191002447872, '2022-05-11 19:48:40', 0, 6); INSERT INTO `base_dict` VALUES (1425744045414772737, 'MenuType', '菜单类型', b'1', '系统属性', '菜单类型', 0, '2021-08-12 17:00:44', 1399985191002447872, '2022-05-11 19:48:44', 0, 4); -INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', NULL, '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); +INSERT INTO `base_dict` VALUES (1430063572491411456, 'loginType', '字典类型', b'1', '基础属性', '字典类型', 1399985191002447872, '2021-08-24 15:05:00', 1399985191002447872, '2021-08-24 15:05:00', 1, 2); INSERT INTO `base_dict` VALUES (1435829999592759296, 'UserStatusCode', '用户状态码', b'1', '系统属性', '用户状态码', 1399985191002447872, '2021-09-09 12:58:43', 1399985191002447872, '2022-05-11 19:48:56', 0, 2); INSERT INTO `base_dict` VALUES (1435838066191458304, 'LogBusinessType', '业务操作类型', b'1', '系统属性', '操作日志记录的业务操作类型', 1399985191002447872, '2021-09-09 13:30:46', 1399985191002447872, '2022-05-11 19:49:00', 0, 2); INSERT INTO `base_dict` VALUES (1438078864509317120, 'MailSecurityCode', '邮箱安全方式编码', b'1', '消息服务', '邮箱安全方式编码', 1399985191002447872, '2021-09-15 17:54:54', 1399985191002447872, '2022-05-11 19:49:06', 0, 2); @@ -3404,28 +3402,12 @@ INSERT INTO `base_dict` VALUES (1439961232651034624, 'MessageTemplateCode', '消 INSERT INTO `base_dict` VALUES (1452836604783845376, 'SocialType', '三方系统类型', b'1', '系统属性', '三方系统类型', 1399985191002447872, '2021-10-26 11:16:54', 1399985191002447872, '2022-05-11 19:48:28', 0, 3); INSERT INTO `base_dict` VALUES (1452843488735621120, 'ParamType', '参数类型', b'1', '系统属性', '参数类型', 1399985191002447872, '2021-10-26 11:44:15', 1399985191002447872, '2022-05-11 19:48:21', 0, 2); INSERT INTO `base_dict` VALUES (1496024933900169216, 'Political', '政治面貌', b'1', '基础数据', '政治面貌', 1399985191002447872, '2022-02-22 15:31:54', 1399985191002447872, '2022-05-11 19:48:04', 0, 1); -INSERT INTO `base_dict` VALUES (1496722894707728384, 'PayChannel', '支付通道', b'1', '支付服务', '支付宝, 微信, 云闪付等', 1399985191002447872, '2022-02-24 13:45:21', 1399985191002447872, '2022-05-11 19:47:51', 0, 1); -INSERT INTO `base_dict` VALUES (1496723207565058048, 'PayWay', '支付方式', b'1', '支付服务', '扫码支付、Wap、App支付等', 1399985191002447872, '2022-02-24 13:46:35', 1399985191002447872, '2022-05-11 19:47:46', 0, 1); -INSERT INTO `base_dict` VALUES (1497140849954185216, 'PayStatus', '支付状态', b'1', '支付服务', '支付中,成功,失败等', 1399985191002447872, '2022-02-25 17:26:09', 1399985191002447872, '2022-05-11 19:47:40', 0, 2); -INSERT INTO `base_dict` VALUES (1501031423232937984, 'AsyncPayChannel', '异步支付通道', b'1', '支付服务', '如微信支付宝云闪付等第三方支付', 1399985191002447872, '2022-03-08 11:05:54', 1399985191002447872, '2022-05-11 19:47:37', 0, 1); -INSERT INTO `base_dict` VALUES (1502276739978473472, 'WalletStatus', '钱包状态', b'1', '支付服务', '钱包状态', 1399985191002447872, '2022-03-11 21:34:20', 1399985191002447872, '2022-05-11 19:47:33', 0, 2); -INSERT INTO `base_dict` VALUES (1502624342339448832, 'WalletOperation', '钱包日志操作类型', b'1', NULL, '', 1399985191002447872, '2022-03-12 20:35:35', 1399985191002447872, '2022-03-12 20:35:35', 1, 0); -INSERT INTO `base_dict` VALUES (1502624515799085056, 'WalletLogType', '钱包日志类型', b'1', '支付服务', '钱包日志类型', 1399985191002447872, '2022-03-12 20:36:17', 1399985191002447872, '2022-05-11 19:47:29', 0, 1); -INSERT INTO `base_dict` VALUES (1502624632392347648, 'WalletLogOperation', '钱包日志操作类型', b'1', '支付服务', '钱包日志操作类型', 1399985191002447872, '2022-03-12 20:36:44', 1399985191002447872, '2022-05-11 19:47:21', 0, 1); -INSERT INTO `base_dict` VALUES (1503340128037212160, 'VoucherStatus', '储值卡状态', b'1', '支付服务', '储值卡状态', 1399985191002447872, '2022-03-14 19:59:52', 1399985191002447872, '2022-05-11 19:47:12', 0, 1); -INSERT INTO `base_dict` VALUES (1524356168611188736, 'input', '手工输入', b'1', '商品服务', '', 1399985191002447872, '2022-05-11 19:50:06', 1399985191002447872, '2022-05-11 19:50:06', 1, 0); -INSERT INTO `base_dict` VALUES (1524356376518643712, 'GoodsParamType', '参数类型', b'1', '商品服务', '列表/手动输入', 1399985191002447872, '2022-05-11 19:50:56', 1399985191002447872, '2022-05-14 23:05:41', 0, 1); -INSERT INTO `base_dict` VALUES (1546757092010078208, 'PayNotifyProcess', '支付回调处理状态', b'1', '支付服务', '成功/忽略/失败', 1399985191002447872, '2022-07-12 15:23:23', 1399985191002447872, '2022-07-12 15:23:53', 0, 1); INSERT INTO `base_dict` VALUES (1556996322223968256, 'WeChatMediaType', '微信媒体类型', b'1', '微信', '微信媒体类型', 1399985191002447872, '2022-08-09 21:30:25', 1399985191002447872, '2022-08-09 21:30:26', 0, 0); INSERT INTO `base_dict` VALUES (1561003021674987520, 'SiteMessageReceive', '消息接收类型', b'1', '站内信', '站内信接收类型', 1399985191002447872, '2022-08-20 22:51:37', 1399985191002447872, '2022-08-20 22:51:37', 0, 0); INSERT INTO `base_dict` VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', b'1', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); -INSERT INTO `base_dict` VALUES (1562696107020230656, 'BpmModelPublish', '工作流模型发布状态', b'1', '工作流', '工作流模型发布状态', 1399985191002447872, '2022-08-25 14:59:20', 1399985191002447872, '2022-08-25 15:27:55', 0, 1); -INSERT INTO `base_dict` VALUES (1563083969989423104, 'BpmTaskAssignType', '工作流处理人分配类型', b'1', '工作流', '流程任务处理人分配类型', 1399985191002447872, '2022-08-26 16:40:34', 1399985191002447872, '2022-08-26 16:40:53', 0, 1); -INSERT INTO `base_dict` VALUES (1567091641298386944, 'BpmTaskState', '流程任务状态', b'1', '工作流', '流程任务状态', 1399985191002447872, '2022-09-06 18:05:37', 1399985191002447872, '2022-09-06 18:05:47', 0, 1); -INSERT INTO `base_dict` VALUES (1570343684024705024, 'BpmTaskResult', '流程任务处理结果', b'1', '工作流', '流程任务处理结果', 1399985191002447872, '2022-09-15 17:28:05', 1414143554414059520, '2022-10-19 23:13:40', 0, 1); -INSERT INTO `base_dict` VALUES (1570764395519111168, 'BpmInstanceState', '流程实例状态', b'1', '工作流', '流程实例状态', 1399985191002447872, '2022-09-16 21:19:50', 1414143554414059520, '2022-10-19 23:13:33', 0, 1); INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', b'1', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1399985191002447872, '2022-12-09 22:09:25', 0, 3); INSERT INTO `base_dict` VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); +INSERT INTO `base_dict` VALUES (1688742690398617600, 'smsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-08 10:43:27', 0, 0); -- ---------------------------- -- Table structure for base_dict_item @@ -3441,9 +3423,9 @@ CREATE TABLE `base_dict_item` ( `sort_no` double(8, 2) NOT NULL COMMENT '排序', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, @@ -3497,85 +3479,11 @@ INSERT INTO `base_dict_item` VALUES (1496027369796743168, 1496024933900169216, ' INSERT INTO `base_dict_item` VALUES (1496027408141070336, 1496024933900169216, 'Political', '11', '台盟盟员', b'1', 11.00, '', 1399985191002447872, '2022-02-22 15:41:44', 1399985191002447872, '2022-02-22 15:41:44', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027456849522688, 1496024933900169216, 'Political', '12', '无党派人士', b'1', 12.00, '', 1399985191002447872, '2022-02-22 15:41:55', 1399985191002447872, '2022-02-22 15:41:55', 0, 0); INSERT INTO `base_dict_item` VALUES (1496027516639326208, 1496024933900169216, 'Political', '13', '群众', b'1', 13.00, '', 1399985191002447872, '2022-02-22 15:42:09', 1399985191002447872, '2022-02-22 15:42:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780500696539136, 1496722894707728384, 'PayChannel', '1', '支付宝', b'1', 1.00, '', 1399985191002447872, '2022-02-24 17:34:15', 1399985191002447872, '2022-03-08 11:02:59', 0, 3); -INSERT INTO `base_dict_item` VALUES (1496780576818962432, 1496722894707728384, 'PayChannel', '2', '微信', b'1', 2.00, '', 1399985191002447872, '2022-02-24 17:34:33', 1399985191002447872, '2022-03-08 11:04:00', 0, 2); -INSERT INTO `base_dict_item` VALUES (1496780712492113920, 1496723207565058048, 'PayWay', '1', 'wap支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:05', 1399985191002447872, '2022-02-24 17:35:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780757647990784, 1496723207565058048, 'PayWay', '2', '应用支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:16', 1399985191002447872, '2022-02-24 17:35:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780799691694080, 1496723207565058048, 'PayWay', '3', 'web支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:26', 1399985191002447872, '2022-02-24 17:35:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780838451257344, 1496723207565058048, 'PayWay', '4', '二维码扫码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:35', 1399985191002447872, '2022-02-24 17:35:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1496780876388737024, 1496723207565058048, 'PayWay', '5', '付款码支付', b'1', 0.00, '', 1399985191002447872, '2022-02-24 17:35:44', 1399985191002447872, '2022-02-24 17:35:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141630803566592, 1497140849954185216, 'PayStatus', '3', '支付取消', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:15', 1399985191002447872, '2022-02-25 17:29:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141652379066368, 1497140849954185216, 'PayStatus', '2', '失败', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:20', 1399985191002447872, '2022-02-25 17:29:20', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141681915355136, 1497140849954185216, 'PayStatus', '1', '成功', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:27', 1399985191002447872, '2022-02-25 17:29:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497141712743489536, 1497140849954185216, 'PayStatus', '0', '支付中', b'1', 0.00, '', 1399985191002447872, '2022-02-25 17:29:35', 1399985191002447872, '2022-02-25 17:29:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1497506810439892992, 1497140849954185216, 'PayStatus', '4', '部分退款', b'1', 1.00, '部分退款', 1399985191002447872, '2022-02-26 17:40:21', 1399985191002447872, '2022-03-04 21:22:46', 0, 7); -INSERT INTO `base_dict_item` VALUES (1499367587857694720, 1497140849954185216, 'PayStatus', '5', '已退款', b'1', 2.00, '完全退款', 1399985191002447872, '2022-03-03 20:54:25', 1399985191002447872, '2022-03-04 21:22:49', 0, 3); -INSERT INTO `base_dict_item` VALUES (1501030031432847360, 1496722894707728384, 'PayChannel', '3', '云闪付', b'1', 3.00, '', 1399985191002447872, '2022-03-08 11:00:22', 1399985191002447872, '2022-03-08 11:04:07', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030073489133568, 1496722894707728384, 'PayChannel', '4', '现金', b'1', 4.00, '', 1399985191002447872, '2022-03-08 11:00:32', 1399985191002447872, '2022-03-08 11:04:10', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501030108314439680, 1496722894707728384, 'PayChannel', '5', '钱包', b'1', 5.00, '', 1399985191002447872, '2022-03-08 11:00:40', 1399985191002447872, '2022-03-08 11:04:14', 0, 2); -INSERT INTO `base_dict_item` VALUES (1501031490513768448, 1501031423232937984, 'AsyncPayChannel', '3', '云闪付', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:10', 1399985191002447872, '2022-03-08 11:06:10', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031518208757760, 1501031423232937984, 'AsyncPayChannel', '2', '微信', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:16', 1399985191002447872, '2022-03-08 11:06:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1501031544360243200, 1501031423232937984, 'AsyncPayChannel', '1', '支付宝', b'1', 0.00, '', 1399985191002447872, '2022-03-08 11:06:23', 1399985191002447872, '2022-03-08 11:06:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276841057005568, 1502276739978473472, 'WalletStatus', '2', '禁用', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:45', 1399985191002447872, '2022-03-11 21:34:45', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502276862108217344, 1502276739978473472, 'WalletStatus', '1', '正常', b'1', 0.00, '', 1399985191002447872, '2022-03-11 21:34:50', 1399985191002447872, '2022-03-11 21:34:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624716257456128, 1502624515799085056, 'WalletLogType', '1', '开通', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:04', 1399985191002447872, '2022-03-12 20:37:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624931978899456, 1502624515799085056, 'WalletLogType', '2', '主动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:37:56', 1399985191002447872, '2022-03-12 20:37:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502624956209393664, 1502624515799085056, 'WalletLogType', '3', '自动充值', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:02', 1399985191002447872, '2022-03-12 20:38:02', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625014719934464, 1502624515799085056, 'WalletLogType', '4', '余额变动', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:16', 1399985191002447872, '2022-03-12 20:38:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625053097816064, 1502624515799085056, 'WalletLogType', '5', '支付', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:25', 1399985191002447872, '2022-03-12 20:38:25', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625091639275520, 1502624515799085056, 'WalletLogType', '6', '系统扣除余额', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:34', 1399985191002447872, '2022-03-12 20:38:34', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625123725701120, 1502624515799085056, 'WalletLogType', '7', '退款', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:38:42', 1399985191002447872, '2022-03-12 20:38:42', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625783145787392, 1502624632392347648, 'WalletLogOperation', '1', '系统操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:19', 1399985191002447872, '2022-03-12 20:41:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625814837948416, 1502624632392347648, 'WalletLogOperation', '2', '管理员操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:26', 1399985191002447872, '2022-03-12 20:41:26', 0, 0); -INSERT INTO `base_dict_item` VALUES (1502625850355314688, 1502624632392347648, 'WalletLogOperation', '3', '用户操作', b'1', 0.00, '', 1399985191002447872, '2022-03-12 20:41:35', 1399985191002447872, '2022-03-12 20:41:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340241493135360, 1503340128037212160, 'VoucherStatus', '1', '启用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:19', 1399985191002447872, '2022-03-14 20:00:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1503340326645895168, 1503340128037212160, 'VoucherStatus', '2', '停用', b'1', 0.00, '', 1399985191002447872, '2022-03-14 20:00:39', 1399985191002447872, '2022-03-14 20:00:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1505112357976612864, 1496722894707728384, 'PayChannel', '6', '储值卡', b'1', 0.00, '', 1399985191002447872, '2022-03-19 17:22:04', 1399985191002447872, '2022-03-19 17:22:04', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356452720758784, 1524356376518643712, 'GoodsParamType', 'input', '手工录入', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:14', 1399985191002447872, '2022-05-11 19:51:14', 0, 0); -INSERT INTO `base_dict_item` VALUES (1524356510157557760, 1524356376518643712, 'GoodsParamType', 'select', '列表选择', b'1', 0.00, '', 1399985191002447872, '2022-05-11 19:51:28', 1399985191002447872, '2022-05-11 19:51:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757293592522752, 1546757092010078208, 'PayNotifyProcess', '0', '失败', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:11', 1399985191002447872, '2022-07-12 15:24:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1546757327901929472, 1546757092010078208, 'PayNotifyProcess', '1', '成功', b'1', -1.00, '', 1399985191002447872, '2022-07-12 15:24:19', 1399985191002447872, '2022-07-12 15:31:38', 0, 2); -INSERT INTO `base_dict_item` VALUES (1546757375637303296, 1546757092010078208, 'PayNotifyProcess', '2', '忽略', b'1', 0.00, '', 1399985191002447872, '2022-07-12 15:24:30', 1399985191002447872, '2022-07-12 15:24:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996422006460416, 1556996322223968256, 'WeChatMediaType', 'news', '新闻', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:30:49', 1399985191002447872, '2022-08-09 21:30:49', 1, 0); -INSERT INTO `base_dict_item` VALUES (1556996472661069824, 1556996322223968256, 'WeChatMediaType', 'voice', '语音', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:01', 1399985191002447872, '2022-08-09 21:31:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996501417218048, 1556996322223968256, 'WeChatMediaType', 'image', '图片', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:08', 1399985191002447872, '2022-08-09 21:31:08', 0, 0); -INSERT INTO `base_dict_item` VALUES (1556996529565192192, 1556996322223968256, 'WeChatMediaType', 'video', '视频', b'1', 0.00, '', 1399985191002447872, '2022-08-09 21:31:15', 1399985191002447872, '2022-08-09 21:31:15', 0, 0); -INSERT INTO `base_dict_item` VALUES (1561003235710320640, 1561003189111603200, 'SiteMessageState', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:28', 1399985191002447872, '2022-08-20 22:52:28', 1, 0); -INSERT INTO `base_dict_item` VALUES (1561003279322693632, 1561003189111603200, 'SiteMessageState', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:52:38', 1399985191002447872, '2022-08-20 22:52:39', 1, 0); INSERT INTO `base_dict_item` VALUES (1561003368762032128, 1561003021674987520, 'SiteMessageReceive', 'user', '指定用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:00', 1399985191002447872, '2022-08-20 22:53:00', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003399778910208, 1561003021674987520, 'SiteMessageReceive', 'all', '全部用户', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:07', 1399985191002447872, '2022-08-20 22:53:24', 0, 1); INSERT INTO `base_dict_item` VALUES (1561003539772194816, 1561003189111603200, 'SiteMessageState', 'sent', '已发送', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:41', 1399985191002447872, '2022-08-20 22:53:41', 0, 0); INSERT INTO `base_dict_item` VALUES (1561003575608328192, 1561003189111603200, 'SiteMessageState', 'cancel', '撤销', b'1', 0.00, '', 1399985191002447872, '2022-08-20 22:53:49', 1399985191002447872, '2022-08-20 22:53:49', 0, 0); INSERT INTO `base_dict_item` VALUES (1561245469535080448, 1561003189111603200, 'SiteMessageState', 'draft', '草稿', b'1', 0.00, '', 1399985191002447872, '2022-08-21 14:55:01', 1399985191002447872, '2022-08-21 14:55:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696390043475968, 1562696107020230656, 'BpmModelPublish', 'published', '已发布', b'1', 0.00, '', 1399985191002447872, '2022-08-25 15:00:28', 1399985191002447872, '2022-08-25 15:00:28', 0, 0); -INSERT INTO `base_dict_item` VALUES (1562696420561231872, 1562696107020230656, 'BpmModelPublish', 'unpublished', '未发布', b'1', 0.00, '未上传xml文档', 1399985191002447872, '2022-08-25 15:00:35', 1399985191002447872, '2022-08-25 15:28:09', 0, 1); -INSERT INTO `base_dict_item` VALUES (1562703450588028928, 1562696107020230656, 'BpmModelPublish', 'unpublishedXml', '未发布(已上传BPMN)', b'1', 0.00, '有xml文档', 1399985191002447872, '2022-08-25 15:28:31', 1399985191002447872, '2022-08-25 15:34:45', 0, 1); -INSERT INTO `base_dict_item` VALUES (1563087300157747200, 1563083969989423104, 'BpmTaskAssignType', 'user', '用户', b'1', 0.00, '', 1399985191002447872, '2022-08-26 16:53:48', 1399985191002447872, '2022-09-06 22:50:15', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091825981980672, 1567091641298386944, 'BpmTaskState', 'running', '处理中', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:21', 1399985191002447872, '2022-09-06 18:06:21', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091863017684992, 1567091641298386944, 'BpmTaskState', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:30', 1399985191002447872, '2022-09-06 18:06:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567091902414782464, 1567091641298386944, 'BpmTaskState', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:06:39', 1399985191002447872, '2022-09-06 18:06:51', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567091993569591296, 1567091641298386944, 'BpmTaskState', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:01', 1399985191002447872, '2022-09-06 18:07:01', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567092037261656064, 1567091641298386944, 'BpmTaskState', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:12', 1399985191002447872, '2022-09-06 18:07:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1567092124226355200, 1567091641298386944, 'BpmTaskState', 'skip', '跳过', b'1', 0.00, '', 1399985191002447872, '2022-09-06 18:07:32', 1399985191002447872, '2022-09-06 18:07:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163310103564288, 1563083969989423104, 'BpmTaskAssignType', 'userGroup', '用户组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:24', 1399985191002447872, '2022-09-06 22:50:24', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163343288897536, 1563083969989423104, 'BpmTaskAssignType', 'role', '角色', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:32', 1399985191002447872, '2022-09-06 22:50:32', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163380693700608, 1563083969989423104, 'BpmTaskAssignType', 'deptMember', '部门成员', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:41', 1399985191002447872, '2022-09-06 22:50:41', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567163412960481280, 1563083969989423104, 'BpmTaskAssignType', 'deptLeader', '部门的负责人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 22:50:49', 1399985191002447872, '2022-09-06 22:50:49', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567175558888923136, 1563083969989423104, 'BpmTaskAssignType', 'roleGroup', '角色组', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:39:05', 1399985191002447872, '2022-09-06 23:39:05', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567178994242002944, 1563083969989423104, 'BpmTaskAssignType', 'sponsor', '发起人', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:52:44', 1399985191002447872, '2022-09-06 23:52:44', 0, 0); -INSERT INTO `base_dict_item` VALUES (1567179143576002560, 1563083969989423104, 'BpmTaskAssignType', 'select', '用户手动选择', b'1', 0.00, '', 1399985191002447872, '2022-09-06 23:53:19', 1399985191002447872, '2022-09-07 00:01:22', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570343731634249728, 1570343684024705024, 'BpmTaskResult', 'pass', '通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:16', 1399985191002447872, '2022-09-15 17:28:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343761636106240, 1570343684024705024, 'BpmTaskResult', 'notPass', '不通过', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:23', 1399985191002447872, '2022-09-15 17:28:23', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343788056027136, 1570343684024705024, 'BpmTaskResult', 'abstain', '弃权', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:29', 1399985191002447872, '2022-09-15 17:28:29', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343826018672640, 1570343684024705024, 'BpmTaskResult', 'reject', '驳回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:38', 1399985191002447872, '2022-09-15 17:28:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343873737269248, 1570343684024705024, 'BpmTaskResult', 'back', '退回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:50', 1399985191002447872, '2022-09-15 17:28:50', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570343913918701568, 1570343684024705024, 'BpmTaskResult', 'retrieve', '取回', b'1', 0.00, '', 1399985191002447872, '2022-09-15 17:28:59', 1399985191002447872, '2022-09-15 17:28:59', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570685888076120064, 1570343684024705024, 'BpmTaskResult', 'autoFinish', '自动完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 16:07:52', 1399985191002447872, '2022-09-16 16:08:02', 0, 1); -INSERT INTO `base_dict_item` VALUES (1570764765255397376, 1570764395519111168, 'BpmInstanceState', 'running', '运行中', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:18', 1399985191002447872, '2022-12-09 22:15:46', 0, 2); -INSERT INTO `base_dict_item` VALUES (1570764802047832064, 1570764395519111168, 'BpmInstanceState', 'finish', '已完成', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:27', 1399985191002447872, '2022-09-16 21:21:27', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570764836319490048, 1570764395519111168, 'BpmInstanceState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 21:21:35', 1399985191002447872, '2022-09-16 21:21:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784215744585728, 1570343684024705024, 'BpmTaskResult', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:38:35', 1399985191002447872, '2022-09-16 22:38:35', 0, 0); -INSERT INTO `base_dict_item` VALUES (1570784331511570432, 1567091641298386944, 'BpmTaskState', 'cancel', '取消', b'1', 0.00, '', 1399985191002447872, '2022-09-16 22:39:03', 1399985191002447872, '2022-09-16 22:39:03', 0, 0); INSERT INTO `base_dict_item` VALUES (1573665422392098816, 1439961232651034624, 'MessageTemplateCode', '0', '站内信', b'1', -11.00, 'SITE', 1399985191002447872, '2022-09-24 21:27:29', 1399985191002447872, '2022-09-24 21:27:39', 0, 1); INSERT INTO `base_dict_item` VALUES (1589528254477488128, 1589527951317389312, 'DataScopePerm', '7', '所在及下级部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:43', 1414143554414059520, '2022-11-07 16:00:43', 0, 0); INSERT INTO `base_dict_item` VALUES (1589528283539820544, 1589527951317389312, 'DataScopePerm', '6', '所在部门', b'1', 0.00, '', 1414143554414059520, '2022-11-07 16:00:49', 1414143554414059520, '2022-11-07 16:00:49', 0, 0); @@ -3587,6 +3495,16 @@ INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, ' INSERT INTO `base_dict_item` VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'smsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'smsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'smsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'smsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'smsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'smsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'smsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'smsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'smsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'smsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); -- ---------------------------- -- Table structure for base_dynamic_data_source @@ -3605,9 +3523,9 @@ CREATE TABLE `base_dynamic_data_source` ( `db_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3628,9 +3546,9 @@ CREATE TABLE `base_dynamic_form` ( `value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '表单内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3651,9 +3569,9 @@ CREATE TABLE `base_key_value` ( `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数键名', `value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3677,9 +3595,9 @@ CREATE TABLE `base_param` ( `internal` bit(1) NOT NULL COMMENT '内置参数', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '更新人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -3692,7 +3610,7 @@ INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123' INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); -INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-07-09 21:42:21', 1399985191002447872, '2022-07-09 21:42:21', 0, 0); +INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '优先级高于配置文件内进行的配置', 1399985191002447872, '2022-07-09 21:42:21', 1414143554414059520, '2023-08-05 16:40:05', 0, 1); INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); -- ---------------------------- @@ -3753,9 +3671,9 @@ CREATE TABLE `base_query_sql` ( `params` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询参数', `fields` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'SQL查询结果字段', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -3806,9 +3724,9 @@ CREATE TABLE `common_sequence_range` ( `range_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区间key', `range_value` bigint(20) NOT NULL COMMENT '区间开始值', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3829,9 +3747,9 @@ CREATE TABLE `demo_data_encrypt` ( `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3853,9 +3771,9 @@ CREATE TABLE `demo_data_perm` ( `creator_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者名称', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3882,9 +3800,9 @@ CREATE TABLE `demo_data_sensitive` ( `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '电子邮件', `other` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其他', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3906,14 +3824,14 @@ CREATE TABLE `demo_super_query` ( `age` int(5) NULL DEFAULT NULL COMMENT '年龄', `vip` bit(1) NULL DEFAULT NULL COMMENT '是否vip', `birthday` date NULL DEFAULT NULL COMMENT '生日', - `work_time` time(0) NULL DEFAULT NULL COMMENT '上班时间', - `registration_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `work_time` time NULL DEFAULT NULL COMMENT '上班时间', + `registration_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `political` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '政治面貌', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -3933,29 +3851,30 @@ INSERT INTO `demo_super_query` VALUES (1496373512871284736, '刘备', 108, b'0', -- ---------------------------- DROP TABLE IF EXISTS `iam_client`; CREATE TABLE `iam_client` ( - `id` bigint(20) NOT NULL, + `id` bigint(20) NOT NULL COMMENT '主键', `code` varchar(21) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `system` bit(1) NOT NULL COMMENT '是否系统内置', `enable` bit(1) NOT NULL COMMENT '是否可用', `login_type_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联登录方式\r\n', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', - `version` int(11) NOT NULL COMMENT '版本', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '删除标志', + `default_endow` bit(1) NULL DEFAULT NULL COMMENT '新注册的用户是否默认赋予该终端', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of iam_client -- ---------------------------- -INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, 0); -INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, 0); -INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1399985191002447872, '2022-10-13 17:14:25', 1, 0); -INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, 0); +INSERT INTO `iam_client` VALUES (1430430071299207168, 'admin', 'pc管理端', b'1', b'1', '1430430071299207168,1435138582839009280,1430478946919653376,1542091599907115008,1542804450312122368,1543126042909016064', 'pc浏览器', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-07-02 14:55:11', 4, b'0', NULL); +INSERT INTO `iam_client` VALUES (1430430071299207169, 'h5', 'h5端', b'1', b'1', '1430430071299207168,1435138582839009280', '手机wap', 1399985191002447872, '2021-08-25 15:21:20', 1399985191002447872, '2022-06-29 18:31:45', 1, b'0', NULL); +INSERT INTO `iam_client` VALUES (1580487061605175296, 'adminv3', 'pc管理端(vue3版)', b'0', b'1', '1430430071299207168,1430478946919653376,1435138582839009280,1542091599907115008,1542804450312122368,1543126042909016064', 'vue3版本', 1399985191002447872, '2022-10-13 17:14:14', 1414143554414059520, '2023-08-02 14:28:37', 2, b'0', b'1'); +INSERT INTO `iam_client` VALUES (1626840094767714304, 'GoView', '可视化平台', b'0', b'1', '1430430071299207168', '', 1414143554414059520, '2023-02-18 15:04:38', 1414143554414059520, '2023-02-18 15:04:38', 0, b'0', NULL); -- ---------------------------- -- Table structure for iam_data_scope @@ -3968,9 +3887,9 @@ CREATE TABLE `iam_data_scope` ( `type` int(4) NOT NULL COMMENT '类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4041,9 +3960,9 @@ CREATE TABLE `iam_dept` ( `address` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '地址', `remark` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4083,9 +4002,9 @@ CREATE TABLE `iam_login_type` ( `enable` bit(1) NOT NULL COMMENT '是否可用', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4130,9 +4049,9 @@ CREATE TABLE `iam_perm_menu` ( `admin` bit(1) NOT NULL COMMENT '系统菜单', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4271,6 +4190,9 @@ INSERT INTO `iam_perm_menu` VALUES (1623494586215579648, 'admin', 15522079825107 INSERT INTO `iam_perm_menu` VALUES (1629039360928075776, 'adminv3', 1582276341792985088, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', '/modules/develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-02-24 16:43:44', 1414143554414059520, '2023-02-24 16:44:17', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1631946120891707392, 'admin', 1552207982510706688, '可视化大屏', 'ProjectInfoList', NULL, b'0', '', b'0', b'0', 'develop/report/ProjectInfoList', NULL, '/develop/report', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1399985191002447872, '2023-03-04 17:14:10', 1399985191002447872, '2023-03-04 17:14:10', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 1582276341792985088, 'SQL查询语句', 'QuerySqlList', NULL, b'0', '', b'0', b'0', '/modules/develop/query/QuerySqlList', NULL, '/develop/querySql', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-03-13 21:40:14', 1414143554414059520, '2023-03-13 21:43:05', 2, 0); +INSERT INTO `iam_perm_menu` VALUES (1687369862646558720, 'adminv3', 1582275984849326080, '短信管理', 'Sms', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/notice/sms', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:48:20', 1414143554414059520, '2023-08-04 15:48:32', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370142234669056, 'adminv3', 1687369862646558720, '短信配置', 'SmsChannelConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/config/SmsChannelConfigList', NULL, '/notice/sms/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:26', 1414143554414059520, '2023-08-04 15:49:26', 0, 0); +INSERT INTO `iam_perm_menu` VALUES (1687370277496778752, 'adminv3', 1687369862646558720, '短信模板', 'SmsTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/template/SmsTemplateList', NULL, '/notice/sms/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:59', 1414143554414059520, '2023-08-04 15:50:38', 1, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -4310,9 +4232,9 @@ CREATE TABLE `iam_role` ( `internal` bit(1) NOT NULL COMMENT '是否系统内置', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '说明', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4407,14 +4329,14 @@ CREATE TABLE `iam_user_expand_info` ( `sex` int(4) NULL DEFAULT NULL COMMENT '性别', `birthday` date NULL DEFAULT NULL COMMENT '生日', `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', - `last_login_time` datetime(0) NULL DEFAULT NULL COMMENT '上次登录时间', - `current_login_time` datetime(0) NULL DEFAULT NULL COMMENT '本次登录时间', + `last_login_time` datetime NULL DEFAULT NULL COMMENT '上次登录时间', + `current_login_time` datetime NULL DEFAULT NULL COMMENT '本次登录时间', `initial_password` bit(1) NOT NULL COMMENT '是否初始密码', - `last_change_password_time` datetime(0) NULL DEFAULT NULL COMMENT '上次修改密码时间', + `last_change_password_time` datetime NULL DEFAULT NULL COMMENT '上次修改密码时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4446,12 +4368,12 @@ CREATE TABLE `iam_user_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像', `source` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '注册来源', `admin` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否超级管理员', - `register_time` datetime(0) NULL DEFAULT NULL COMMENT '注册时间', + `register_time` datetime NULL DEFAULT NULL COMMENT '注册时间', `status` tinyint(4) NOT NULL COMMENT '账号状态', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4499,9 +4421,9 @@ CREATE TABLE `iam_user_third` ( `ding_talk_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '钉钉唯一标识', `we_com_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信唯一标识', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, @@ -4525,9 +4447,9 @@ CREATE TABLE `iam_user_third_info` ( `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户头像', `third_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '关联第三方平台的用户id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' @@ -4554,9 +4476,9 @@ CREATE TABLE `notice_mail_config` ( `activity` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `security_type` int(2) NULL DEFAULT NULL COMMENT '安全传输方式 1:plain 2:tls 3:ssl', `creator` bigint(18) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(18) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(8) NULL DEFAULT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -4575,12 +4497,12 @@ CREATE TABLE `notice_message_template` ( `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称', `data` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板数据', - `type` int(11) NULL DEFAULT NULL COMMENT '模板类型', + `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板类型', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4589,15 +4511,15 @@ CREATE TABLE `notice_message_template` ( -- ---------------------------- -- Records of notice_message_template -- ---------------------------- -INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', 1, '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', 0, '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', 0, '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); -INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', 0, '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', 0, '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); -INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', 0, '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); -INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', 0, '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); +INSERT INTO `notice_message_template` VALUES (1424936204932169730, 'cs', '测试', 'hello ${msg}6666666666666666666666666666', '1', '测试模板', 0, '2021-08-10 11:30:40', 0, '2021-08-10 11:30:40', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951326893510656, 'BpmTaskCreated', '流程任务创建事件', '流程任务创建事件', '0', '', 1399985191002447872, '2022-09-25 16:23:34', 1399985191002447872, '2022-09-25 16:23:34', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573951515616219136, 'BpmTaskAssignCreated', '流程任务更改处理人事件(新处理人)', '流程任务更改处理人事件(新处理人)', '0', '', 1399985191002447872, '2022-09-25 16:24:19', 1399985191002447872, '2022-09-25 16:27:09', 1, 0); +INSERT INTO `notice_message_template` VALUES (1573952505056727040, 'BpmTaskAssignCancel', '流程任务更改处理人事件(原处理人)', '流程任务更改处理人事件(原处理人)', '0', '', 1399985191002447872, '2022-09-25 16:28:14', 1399985191002447872, '2022-09-25 16:28:14', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952568654958592, 'BpmTaskCancel', '流程任务取消事件', '流程任务取消事件', '0', '', 1399985191002447872, '2022-09-25 16:28:30', 1399985191002447872, '2022-09-25 16:28:30', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952621826150400, 'BpmTaskReject', '流程任务驳回事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-09-25 16:28:42', 1399985191002447872, '2022-09-25 16:28:42', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952709432578048, 'BpmInstanceCompleted', '流程完成时通知发起人', '流程完成时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:03', 1399985191002447872, '2022-09-25 16:29:03', 0, 0); +INSERT INTO `notice_message_template` VALUES (1573952762507300864, 'BpmInstanceCancel', '流程取消时通知发起人', '流程取消时通知发起人', '0', '', 1399985191002447872, '2022-09-25 16:29:16', 1399985191002447872, '2022-09-25 16:29:16', 0, 0); +INSERT INTO `notice_message_template` VALUES (1580083314274070528, 'BpmTaskBack', '流程任务回退事件', '流程任务驳回事件', '0', '', 1399985191002447872, '2022-10-12 14:29:53', 1399985191002447872, '2022-10-12 14:30:11', 1, 0); -- ---------------------------- -- Table structure for notice_site_message @@ -4609,15 +4531,15 @@ CREATE TABLE `notice_site_message` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息内容', `sender_id` bigint(20) NULL DEFAULT NULL COMMENT '发送者id', `sender_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发送者姓名', - `sender_time` datetime(0) NULL DEFAULT NULL COMMENT '发送时间', + `sender_time` datetime NULL DEFAULT NULL COMMENT '发送时间', `receive_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型', `send_state` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布状态', - `efficient_time` datetime(0) NULL DEFAULT NULL COMMENT '截至有效期', - `cancel_time` datetime(0) NULL DEFAULT NULL COMMENT '撤回时间', + `efficient_time` datetime NULL DEFAULT NULL COMMENT '截至有效期', + `cancel_time` datetime NULL DEFAULT NULL COMMENT '撤回时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4636,9 +4558,9 @@ CREATE TABLE `notice_site_message_user` ( `message_id` bigint(20) NOT NULL COMMENT '消息id', `receive_id` bigint(20) NOT NULL COMMENT '接收者id', `have_read` bit(1) NOT NULL COMMENT '已读/未读', - `read_time` datetime(0) NULL DEFAULT NULL COMMENT '已读时间', + `read_time` datetime NULL DEFAULT NULL COMMENT '已读时间', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uni_receive_message`(`receive_id`, `message_id`) USING BTREE COMMENT '接收人和消息联合索引', @@ -4659,17 +4581,21 @@ INSERT INTO `notice_site_message_user` VALUES (1561379841968648192, 156136589480 DROP TABLE IF EXISTS `notice_sms_channel_config`; CREATE TABLE `notice_sms_channel_config` ( `id` bigint(20) NOT NULL COMMENT '主键', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道编码', - `signature` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信签名', - `api_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信ApiKey', - `api_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '短信Api秘钥', - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '回调地址', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型编码', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '渠道类型名称', + `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + `access_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessKey', + `config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置字符串', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `access_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'AccessSecret', + `image` bigint(20) NULL DEFAULT NULL COMMENT '图片', + `sort_no` double(10, 0) NULL DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '短信渠道配置' ROW_FORMAT = DYNAMIC; @@ -4692,9 +4618,9 @@ CREATE TABLE `notice_sms_config` ( `from_num` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, @@ -4707,6 +4633,29 @@ CREATE TABLE `notice_sms_config` ( -- Records of notice_sms_config -- ---------------------------- +-- ---------------------------- +-- Table structure for notice_sms_template +-- ---------------------------- +DROP TABLE IF EXISTS `notice_sms_template`; +CREATE TABLE `notice_sms_template` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `supplier_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `template_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信渠道商类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板名称', + `content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '短信模板内容', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL COMMENT '删除标志', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '短信模板配置' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of notice_sms_template +-- ---------------------------- + -- ---------------------------- -- Table structure for notice_wechat_config -- ---------------------------- @@ -4720,9 +4669,9 @@ CREATE TABLE `notice_wechat_config` ( `corp_secret` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `is_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否默认配置，0:否。1:是', `creator` bigint(18) NULL DEFAULT NULL, - `create_time` datetime(0) NULL DEFAULT NULL, + `create_time` datetime NULL DEFAULT NULL, `last_modifier` bigint(18) NULL DEFAULT NULL, - `last_modified_time` datetime(0) NULL DEFAULT NULL, + `last_modified_time` datetime NULL DEFAULT NULL, `version` int(10) NULL DEFAULT NULL, `deleted` tinyint(1) NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -4980,9 +4929,9 @@ CREATE TABLE `report_project_info` ( `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', `index_image` bigint(20) NULL DEFAULT NULL COMMENT '预览图片id', @@ -5002,9 +4951,9 @@ CREATE TABLE `report_project_info_publish` ( `id` bigint(20) NOT NULL COMMENT '主键', `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '报表内容', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', `deleted` bit(1) NOT NULL COMMENT '删除标志', PRIMARY KEY (`id`) USING BTREE @@ -5027,7 +4976,7 @@ CREATE TABLE `starter_audit_data_version` ( `change_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '数据更新内容', `version` int(10) NOT NULL COMMENT '版本', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据版本日志' ROW_FORMAT = DYNAMIC; @@ -5053,7 +5002,7 @@ CREATE TABLE `starter_audit_login_log` ( `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统', `browser` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型', `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息', - `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间', + `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; @@ -5080,7 +5029,7 @@ CREATE TABLE `starter_audit_operate_log` ( `operate_return` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '返回参数', `success` bit(1) NULL DEFAULT NULL COMMENT '是否成功', `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误提示', - `operate_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间', + `operate_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志' ROW_FORMAT = DYNAMIC; @@ -5130,6 +5079,21 @@ CREATE TABLE `starter_ding_robot_config` ( -- Records of starter_ding_robot_config -- ---------------------------- +-- ---------------------------- +-- Table structure for starter_file_data +-- ---------------------------- +DROP TABLE IF EXISTS `starter_file_data`; +CREATE TABLE `starter_file_data` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `base64` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'base64方式存储', + `data` longblob NULL COMMENT 'base64方式存储', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '上传文件数据' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of starter_file_data +-- ---------------------------- + -- ---------------------------- -- Table structure for starter_file_upload_info -- ---------------------------- @@ -5143,7 +5107,7 @@ CREATE TABLE `starter_file_upload_info` ( `file_size` bigint(20) NULL DEFAULT NULL COMMENT '文件大小', `external_storage_id` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '外部关联id', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '上传文件信息' ROW_FORMAT = DYNAMIC; @@ -5164,9 +5128,9 @@ CREATE TABLE `starter_quartz_job` ( `state` int(4) NULL DEFAULT NULL COMMENT '状态', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', PRIMARY KEY (`id`) USING BTREE @@ -5188,10 +5152,10 @@ CREATE TABLE `starter_quartz_job_log` ( `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '处理器全限定名', `success` bit(1) NOT NULL COMMENT '是否执行成功', `error_message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '错误信息', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', `duration` bigint(255) NULL DEFAULT NULL COMMENT '执行时长', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务执行日志' ROW_FORMAT = DYNAMIC; @@ -5230,7 +5194,7 @@ CREATE TABLE `starter_wx_fans` ( `id` bigint(20) NOT NULL, `openid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '关联OpenId', `subscribe_status` bit(1) NULL DEFAULT NULL COMMENT '订阅状态', - `subscribe_time` datetime(0) NULL DEFAULT NULL COMMENT '订阅时间', + `subscribe_time` datetime NULL DEFAULT NULL COMMENT '订阅时间', `nickname` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `sex` varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性别', `language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语言', @@ -5257,9 +5221,9 @@ CREATE TABLE `starter_wx_menu` ( `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', `publish` bit(1) NOT NULL COMMENT '是否发布', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0:未删除。1:已删除', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE @@ -5285,9 +5249,9 @@ CREATE TABLE `starter_wx_template` ( `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板内容', `example` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '示例', `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修改人', - `last_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '最后修改时间', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '版本', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `inx_`(`template_id`) USING BTREE COMMENT '模板id' -- Gitee From a260b45b6d06f6b3357d5a67b49d86ce8cd7e0c5 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Tue, 8 Aug 2023 20:04:18 +0800 Subject: [PATCH 17/35] =?UTF-8?q?build=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- _doc/ChangeLog.md | 24 ++++++++++++------- _doc/Task.md | 13 ++-------- bootx-common-core/pom.xml | 2 +- .../common-starter-audit-log/pom.xml | 2 +- .../common-starter-auth/pom.xml | 2 +- .../common-starter-code-gen/pom.xml | 2 +- .../common-starter-data-perm/pom.xml | 2 +- .../common-starter-dingtalk/pom.xml | 2 +- .../common-starter-file/pom.xml | 2 +- .../common-starter-monitor/pom.xml | 2 +- .../common-starter-quartz/pom.xml | 2 +- .../common-starter-wechat/pom.xml | 2 +- .../common-starter-wecom/pom.xml | 2 +- bootx-common-starters/pom.xml | 2 +- bootx-commons/common-cache/pom.xml | 2 +- bootx-commons/common-data-translate/pom.xml | 2 +- bootx-commons/common-eventer/pom.xml | 2 +- .../common-exception-handler/pom.xml | 2 +- bootx-commons/common-header-holder/pom.xml | 2 +- bootx-commons/common-idempotency/pom.xml | 2 +- bootx-commons/common-jackson/pom.xml | 2 +- bootx-commons/common-log/pom.xml | 2 +- bootx-commons/common-mongo/pom.xml | 2 +- bootx-commons/common-mybatis-plus/pom.xml | 2 +- bootx-commons/common-rabbitmq/pom.xml | 2 +- bootx-commons/common-redis-client/pom.xml | 2 +- bootx-commons/common-sequence/pom.xml | 2 +- bootx-commons/common-spring/pom.xml | 2 +- bootx-commons/common-super-query/pom.xml | 2 +- bootx-commons/common-swagger/pom.xml | 2 +- bootx-commons/common-websocket/pom.xml | 2 +- bootx-commons/common-xxl-job/pom.xml | 2 +- bootx-commons/pom.xml | 2 +- bootx-demo/pom.xml | 2 +- bootx-services/pom.xml | 2 +- bootx-services/service-baseapi/pom.xml | 2 +- bootx-services/service-iam/pom.xml | 2 +- bootx-services/service-miniapp/pom.xml | 2 +- bootx-services/service-notice/pom.xml | 2 +- bootx-services/service-visualization/pom.xml | 2 +- bootx-start/pom.xml | 2 +- .../src/main/resources/application-dev.yml | 2 +- pom.xml | 4 ++-- 44 files changed, 61 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index ba6f284e..8823950b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Bootx-Platform (v1.3.2-园博园) +# Bootx-Platform (v1.3.3-园博园)

star - Build Status + Build Status Build Status Downloads diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index c3af0c1b..051a20f3 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,6 +1,12 @@ # CHANGELOG ## [v1.3.3] 一号线-园博园 - +- 新增: 添加短信配置, 集成SMS4J, 支持分渠道配置 +- 新增: 新版自定义表单集成(epic-designer尚处于测试版) +- 新增: 各种事件通知, 用户相关/角色相关/短信渠道配置相关 +- 新增: vxe暗黑模式适配 +- 优化: 终端可以设置新注册用户是否默认拥有该终端的权限 +- 优化: 删除工作流和支付相关代码 +- fix: JacksonUtil标识未生效 ## [v1.3.2] 一号线-园博园 - 新增: 查询生成器支持排序 - 优化: 版本依赖升级 @@ -89,7 +95,7 @@ - 数据字段翻译功能支持字典翻译 - 中国行政区划信息扩展至五级，支持村庄社区 - 优化 TreeBuildUtil优化Children的生成 -- fix plumelog新版本有问题（实时日志不显示）, 回滚版本 +- fiplumelog新版本有问题（实时日志不显示）, 回滚版本 **Vue3更新** - 中国行政区划演示 - 幂等接口演示 @@ -154,7 +160,7 @@ - 优化: redisson启动机制修改, 不再会导致项目无法启动 - 优化: 钱包报错提示优化 - 优化: vue3模板调整 -- fix ts映射字段类型缺失 +- fits映射字段类型缺失 **Vue3进度** - 新增: 企业微信机器人和钉钉机器人配置 @@ -268,8 +274,8 @@ - 增加流程回退处理 - 优化用户基础信息修改 - 优化消息通知内容显示 -- fix 系统内置终端不允许删除 -- fix addable/editable/showable, 状态不随动问题 +- fi系统内置终端不允许删除 +- fiaddable/editable/showable, 状态不随动问题 **Vue3进度** - 移植 终端管理, 增加登录方式 功能 @@ -302,7 +308,7 @@ - 优化重写多实例任务Behavior结束条件 - 优化拆分ApplyFormShow前端组件 - 优化多实例任务记录多实例关联id -- fix 流程节点人员分类信息丢失 +- fi流程节点人员分类信息丢失 ## [v1.1.2] 一号线-工研院 - 增加流程节点人员基础分配类型，新增发起人、指定用户、指定角色、运行时指定等方式 - 增加跳过当前节点配置 @@ -485,7 +491,7 @@ - 优化: 前端修改密码时的提示 - 优化: 字典翻译工具类增加异步方法，解决获取不到字典项的问题 - 优化: 日志文件同时输出log格式文件，保留日期更改为30天 -- fix 字典项分页查询报错 +- fi字典项分页查询报错 ## [v1.1.0-alpha-4] 一号线-工研院.预览版4 - 升级Spring boot 2.6.2、Mybatis Plus 3.5.0 @@ -504,8 +510,8 @@ - 优化: 角色管理给分配菜单权限支持搜索 - 优化: 部门机构支持搜索 - 优化: 部门删除时发送事件，用到部门的地方进行了处理 -- fix 路径误拦截问题 -- fix 云效构建后登录报序列化错误 +- fi路径误拦截问题 +- fi云效构建后登录报序列化错误 ## [v1.1.0-alpha-3] 一号线-工研院.预览版3 - 升级Spring boot 2.6.x diff --git a/_doc/Task.md b/_doc/Task.md index bc6b5885..a2f67693 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,18 +1,9 @@ -## 1.3.3 -- x 终端可以设置新注册用户是否默认拥有该终端的权限 -- x 增加一种数据库文件存储方式，作为轻量级功能进行使用 -- x 添加短信配置, 集成SMS4J -- x 添加各种事件 - - x 用户相关 - - x 角色相关 - - x 短信渠道配置 -- x vxe暗黑模式适配 -- x 删除工作流相关代码 -- x 新版自定义表单集成(epic-designer尚处于测试版) ## 1.3.4 - MiniApp添加用户协议/隐私协议等(富文本) - 小程序工单功能 +- 小程序日报功能 - 小程序用户反馈功能 +- 敏感字功能 ## 1.3.x - PostgreSQL 数据库适配 - 添加短信模板功能, 可以与各短信商渠道进行同步 diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml index 78ea19c0..7afde8db 100644 --- a/bootx-common-core/pom.xml +++ b/bootx-common-core/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml index 643c34f6..21233564 100644 --- a/bootx-common-starters/common-starter-audit-log/pom.xml +++ b/bootx-common-starters/common-starter-audit-log/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml index d91bec7d..f408f0d8 100644 --- a/bootx-common-starters/common-starter-auth/pom.xml +++ b/bootx-common-starters/common-starter-auth/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.2 + 1.3.3 4.0.0 common-starter-auth diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml index a9e1a649..7a72e9f3 100644 --- a/bootx-common-starters/common-starter-code-gen/pom.xml +++ b/bootx-common-starters/common-starter-code-gen/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml index 90b22b16..950a73b0 100644 --- a/bootx-common-starters/common-starter-data-perm/pom.xml +++ b/bootx-common-starters/common-starter-data-perm/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml index 250324b8..80cc29b9 100644 --- a/bootx-common-starters/common-starter-dingtalk/pom.xml +++ b/bootx-common-starters/common-starter-dingtalk/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index c2e6cff5..389749e8 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml index 01e2a070..72c247a7 100644 --- a/bootx-common-starters/common-starter-monitor/pom.xml +++ b/bootx-common-starters/common-starter-monitor/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 jar diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml index f996f1be..c20f0927 100644 --- a/bootx-common-starters/common-starter-quartz/pom.xml +++ b/bootx-common-starters/common-starter-quartz/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml index bcc1372c..581c7f41 100644 --- a/bootx-common-starters/common-starter-wechat/pom.xml +++ b/bootx-common-starters/common-starter-wechat/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml index ebbbbc3c..4e9bdb39 100644 --- a/bootx-common-starters/common-starter-wecom/pom.xml +++ b/bootx-common-starters/common-starter-wecom/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.2 + 1.3.3 4.0.0 jar diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml index 152c46eb..3b798843 100644 --- a/bootx-common-starters/pom.xml +++ b/bootx-common-starters/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml index 60c85033..ad555584 100644 --- a/bootx-commons/common-cache/pom.xml +++ b/bootx-commons/common-cache/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml index ab171b8c..ba406178 100644 --- a/bootx-commons/common-data-translate/pom.xml +++ b/bootx-commons/common-data-translate/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-eventer/pom.xml b/bootx-commons/common-eventer/pom.xml index bdb69f8b..4b095318 100644 --- a/bootx-commons/common-eventer/pom.xml +++ b/bootx-commons/common-eventer/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 common-eventer diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml index ea589798..2adb989e 100644 --- a/bootx-commons/common-exception-handler/pom.xml +++ b/bootx-commons/common-exception-handler/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 common-exception-handler diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml index 46efb91f..310e66e9 100644 --- a/bootx-commons/common-header-holder/pom.xml +++ b/bootx-commons/common-header-holder/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml index 1c730d41..d9d3745a 100644 --- a/bootx-commons/common-idempotency/pom.xml +++ b/bootx-commons/common-idempotency/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml index 053b6dbf..51b83427 100644 --- a/bootx-commons/common-jackson/pom.xml +++ b/bootx-commons/common-jackson/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml index 9a739f5b..96da106d 100644 --- a/bootx-commons/common-log/pom.xml +++ b/bootx-commons/common-log/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml index 3c11673e..293551c9 100644 --- a/bootx-commons/common-mongo/pom.xml +++ b/bootx-commons/common-mongo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.2 + 1.3.3 4.0.0 common-mongo diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml index 2b526346..06f249b0 100644 --- a/bootx-commons/common-mybatis-plus/pom.xml +++ b/bootx-commons/common-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml index 8387765b..9c49e2f1 100644 --- a/bootx-commons/common-rabbitmq/pom.xml +++ b/bootx-commons/common-rabbitmq/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml index 2771c6bd..f76c6573 100644 --- a/bootx-commons/common-redis-client/pom.xml +++ b/bootx-commons/common-redis-client/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml index 2fa5b4a1..085ba398 100644 --- a/bootx-commons/common-sequence/pom.xml +++ b/bootx-commons/common-sequence/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml index 0d37ae06..4432d11a 100644 --- a/bootx-commons/common-spring/pom.xml +++ b/bootx-commons/common-spring/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml index 0c65c37c..581ed7b6 100644 --- a/bootx-commons/common-super-query/pom.xml +++ b/bootx-commons/common-super-query/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml index a9bd97ca..c8ff6d93 100644 --- a/bootx-commons/common-swagger/pom.xml +++ b/bootx-commons/common-swagger/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml index 65089d67..c44c1107 100644 --- a/bootx-commons/common-websocket/pom.xml +++ b/bootx-commons/common-websocket/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml index d3e124af..b065daa2 100644 --- a/bootx-commons/common-xxl-job/pom.xml +++ b/bootx-commons/common-xxl-job/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index 8fb95c18..669f4411 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -7,7 +7,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 bootx-commons diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index e81bd2da..b7ed06cf 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 521611d6..742c33a9 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 service-miniapp diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml index e3c49b99..1b354bdc 100644 --- a/bootx-services/service-baseapi/pom.xml +++ b/bootx-services/service-baseapi/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 1f939f03..0a92ea4c 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-services/service-miniapp/pom.xml b/bootx-services/service-miniapp/pom.xml index 5292f2c9..d93bb8f1 100644 --- a/bootx-services/service-miniapp/pom.xml +++ b/bootx-services/service-miniapp/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-services - 1.3.2 + 1.3.3 service-miniapp diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 6c670873..6fe77931 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -5,7 +5,7 @@ bootx-services cn.bootx.platform - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml index 094c5d58..da1f1946 100644 --- a/bootx-services/service-visualization/pom.xml +++ b/bootx-services/service-visualization/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.2 + 1.3.3 4.0.0 diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index de9f6e58..b451e350 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.2 + 1.3.3 4.0.0 bootx-start diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 7eaab83b..b1a4b6ec 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -93,7 +93,7 @@ bootx: swagger: enabled: true author: bootx - version: 1.3.2 + version: 1.3.3 title: bootx开发平台单体版 description: bootx-platform开发平台单体版 # basic认证 diff --git a/pom.xml b/pom.xml index 02bf7279..00edca8f 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 1.8 - 1.3.2 + 1.3.3 5.8.20 6.4.4 @@ -109,7 +109,7 @@ 1.34.0 1.16.5 8.5.4 - 3.5.3.1 + 3.5.3.2 3.6.1 1.6.15 3.23.0 -- Gitee From 49d7c8d500d6cd027e37ec0cfca40ff100b4f079 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Tue, 8 Aug 2023 20:26:13 +0800 Subject: [PATCH 18/35] =?UTF-8?q?feat=20=E6=95=8F=E6=84=9F=E8=AF=8D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91,=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=87=A0=E7=A7=8DMP=E7=9A=84=E7=B1=BB=E5=9E=8B=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=99=A8=E7=B1=BB,=20=E5=8D=87=E7=BA=A7MP=E7=89=88?= =?UTF-8?q?=E6=9C=AC,=20=E5=88=A0=E9=99=A4APP=E7=9B=B8=E5=85=B3=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _license/LICENSE.md | 3 + _license/wordfilter/LICENSE | 201 ++++++++++++++++ .../handler/IntegerListTypeHandler.java | 39 ++++ .../handler/LongListTypeHandler.java | 39 ++++ .../handler/StringListTypeHandler.java | 40 ++++ .../controller/AppVersionController.java | 58 ----- .../core/app/convert/AppVersionConvert.java | 26 --- .../core/app/dao/AppVersionManager.java | 35 --- .../core/app/dao/AppVersionMapper.java | 16 -- .../baseapi/core/app/entity/AppVersion.java | 53 ----- .../core/app/service/AppVersionService.java | 67 ------ .../core/chinaword/entity/ChinaWord.java | 39 ++++ .../core/chinaword/wordfilter/EndType.java | 16 ++ .../core/chinaword/wordfilter/FlagIndex.java | 48 ++++ .../chinaword/wordfilter/WordContext.java | 194 ++++++++++++++++ .../core/chinaword/wordfilter/WordFilter.java | 214 ++++++++++++++++++ .../core/chinaword/wordfilter/WordType.java | 15 ++ pom.xml | 2 +- 18 files changed, 849 insertions(+), 256 deletions(-) create mode 100644 _license/wordfilter/LICENSE create mode 100644 bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java create mode 100644 bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java create mode 100644 bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java delete mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java diff --git a/_license/LICENSE.md b/_license/LICENSE.md index 258d7c4d..13445216 100644 --- a/_license/LICENSE.md +++ b/_license/LICENSE.md @@ -44,3 +44,6 @@ https://gitee.com/dromara/easy_trans vxe-table暗黑主题灵感 https://github.com/adoin + +DFA算法实现的敏感词过滤工具，支持Skip参数控制敏感词干扰噪音，支持白名单跳过白名单词汇，支持在线添加和删除敏感词，管理敏感词库: +https://gitee.com/humingzhang/wordfilter diff --git a/_license/wordfilter/LICENSE b/_license/wordfilter/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/_license/wordfilter/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java new file mode 100644 index 00000000..a5afb5b1 --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/IntegerListTypeHandler.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class IntegerListTypeHandler extends AbstractJsonTypeHandler> { + + private static final String COMMA = ","; + + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + int[] longs = StrUtil.splitToInt(value, COMMA); + return Arrays.stream(longs).boxed().collect(Collectors.toList()); + } + return null; + } + + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + + } +} diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java new file mode 100644 index 00000000..5c3393a6 --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/LongListTypeHandler.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class LongListTypeHandler extends AbstractJsonTypeHandler> { + + private static final String COMMA = ","; + + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + long[] longs = StrUtil.splitToLong(value, COMMA); + return Arrays.stream(longs).boxed().collect(Collectors.toList()); + } + return null; + } + + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + + } +} diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java new file mode 100644 index 00000000..13d82667 --- /dev/null +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/StringListTypeHandler.java @@ -0,0 +1,40 @@ +package cn.bootx.platform.common.mybatisplus.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; +import org.apache.ibatis.type.JdbcType; +import org.apache.ibatis.type.MappedJdbcTypes; +import org.apache.ibatis.type.MappedTypes; + +import java.util.List; + +/** + * List 的类型转换器类 + * @author xxm + * @since 2023/8/8 + */ +@MappedTypes(List.class) +@MappedJdbcTypes({JdbcType.VARCHAR,JdbcType.LONGVARCHAR}) +public class StringListTypeHandler extends AbstractJsonTypeHandler> { + private static final String COMMA = ","; + + /** + * 反系列化 + */ + @Override + protected List parse(String value) { + if (StrUtil.isNotBlank(value)){ + return StrUtil.splitTrim(value, COMMA); + } + return null; + } + + /** + * 序列化 + */ + @Override + protected String toJson(List obj) { + return CollUtil.join(obj, COMMA); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java deleted file mode 100644 index 9204b883..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/AppVersionController.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.bootx.platform.baseapi.controller; - -import cn.bootx.platform.baseapi.core.app.service.AppVersionService; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.common.core.rest.PageResult; -import cn.bootx.platform.common.core.rest.Res; -import cn.bootx.platform.common.core.rest.ResResult; -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -/** - * @author xxm - * @since 2021/8/9 - */ -@Tag(name = "app版本管理") -@RestController -@RequestMapping("/app/version") -@RequiredArgsConstructor -public class AppVersionController { - - private final AppVersionService appVersionService; - - @Operation(summary = "添加") - @PostMapping("/add") - public ResResult add(@RequestBody AppVersionParam param) { - return Res.ok(appVersionService.add(param)); - } - - @Operation(summary = "删除") - @DeleteMapping("/delete") - public ResResult delete(Long id) { - appVersionService.delete(id); - return Res.ok(); - } - - @Operation(summary = "检查更新") - @PostMapping("/check") - public ResResult check() { - return Res.ok(appVersionService.check()); - } - - @Operation(summary = "分页") - @GetMapping("/page") - public ResResult> page(PageParam pageParam) { - return Res.ok(appVersionService.page(pageParam)); - } - - @Operation(summary = "查询详情") - @PostMapping("/findById") - public ResResult findById(Long id) { - return Res.ok(appVersionService.findById(id)); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java deleted file mode 100644 index 4b9628ab..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/convert/AppVersionConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.convert; - -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 转换 - * - * @author xxm - * @since 2021/8/9 - */ -@Mapper -public interface AppVersionConvert { - - AppVersionConvert CONVERT = Mappers.getMapper(AppVersionConvert.class); - - AppVersion convert(AppVersionParam in); - - AppVersion convert(AppVersionDto in); - - AppVersionDto convert(AppVersion in); - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java deleted file mode 100644 index f4161da1..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionManager.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.dao; - -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.common.mybatisplus.base.MpIdEntity; -import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * app版本管理 - * - * @author xxm - * @since 2021/8/9 - */ -@Slf4j -@Repository -@RequiredArgsConstructor -public class AppVersionManager extends BaseManager { - - public Page page(PageParam pageParam) { - Page mpPage = MpUtil.getMpPage(pageParam, AppVersion.class); - return lambdaQuery().orderByDesc(MpIdEntity::getId).page(mpPage); - } - - public Optional findLatest() { - return MpUtil.findOne(lambdaQuery().orderByDesc(AppVersion::getAppVersion)); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java deleted file mode 100644 index c3254a3b..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/dao/AppVersionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.dao; - -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * app版本 - * - * @author xxm - * @since 2021/8/9 - */ -@Mapper -public interface AppVersionMapper extends BaseMapper { - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java deleted file mode 100644 index 49c71553..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/entity/AppVersion.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.entity; - -import cn.bootx.platform.baseapi.core.app.convert.AppVersionConvert; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * App版本 - * - * @author xxm - * @since 2021/8/9 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -@TableName("App版本") -public class AppVersion extends MpBaseEntity implements EntityBaseFunction { - - /** app版本 */ - private String appVersion; - - /** 下载地址 */ - private String url; - - /** 密码 */ - private String password; - - /** 包名 */ - private String bundleId; - - /** 说明 */ - private String description; - - public static AppVersion init(AppVersionDto in) { - return AppVersionConvert.CONVERT.convert(in); - } - - public static AppVersion init(AppVersionParam in) { - return AppVersionConvert.CONVERT.convert(in); - } - - @Override - public AppVersionDto toDto() { - return AppVersionConvert.CONVERT.convert(this); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java deleted file mode 100644 index c086eb2c..00000000 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/app/service/AppVersionService.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.bootx.platform.baseapi.core.app.service; - -import cn.bootx.platform.baseapi.core.app.dao.AppVersionManager; -import cn.bootx.platform.baseapi.core.app.entity.AppVersion; -import cn.bootx.platform.baseapi.dto.app.AppVersionDto; -import cn.bootx.platform.baseapi.param.app.AppVersionParam; -import cn.bootx.platform.common.core.exception.DataNotExistException; -import cn.bootx.platform.common.core.rest.PageResult; -import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.common.mybatisplus.util.MpUtil; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * 版本管理 - * - * @author xxm - * @since 2021/8/9 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AppVersionService { - - private final AppVersionManager appVersionManager; - - /** - * 添加 - */ - public AppVersionDto add(AppVersionParam param) { - AppVersion appVersion = AppVersion.init(param); - return appVersionManager.save(appVersion).toDto(); - } - - /** - * 删除 - */ - public void delete(Long id) { - appVersionManager.deleteById(id); - } - - /** - * 检查更新 - */ - public AppVersionDto check() { - Optional appVersion = appVersionManager.findLatest(); - return appVersion.map(AppVersion::toDto).orElseThrow(DataNotExistException::new); - } - - /** - * 分页 - */ - public PageResult page(PageParam pageParam) { - return MpUtil.convert2DtoPageResult(appVersionManager.page(pageParam)); - } - - /** - * 获取详情 - */ - public AppVersionDto findById(Long id) { - return appVersionManager.findById(id).map(AppVersion::toDto).orElseThrow(DataNotExistException::new); - } - -} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java new file mode 100644 index 00000000..0d3049a8 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.baseapi.core.chinaword.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; +import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * 敏感词 + * @author xxm + * @since 2023/8/8 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@DbTable(comment = "敏感词") +@Accessors(chain = true) +@TableName(value = "base_china_word",autoResultMap = true) +public class ChinaWord extends MpDelEntity { + + /** 敏感词 */ + private String name; + /** 描述 */ + private String description; + /** + * 标签数组 + * 不同的业务场景下，需要启用不同标签的敏感词。 + * + */ + @TableField(typeHandler = StringListTypeHandler.class) + private List tags; + /** 是否启用 */ + private Boolean enable; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java new file mode 100644 index 00000000..1e88c045 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/EndType.java @@ -0,0 +1,16 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + + +/** + * 结束类型定义 + * + * @author minghu.zhang + * @date 11:37 2020/11/11 + **/ +public enum EndType { + + /** + * 有下一个，结束 + */ + HAS_NEXT, IS_END +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java new file mode 100644 index 00000000..19d0450e --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java @@ -0,0 +1,48 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.util.List; + +/** + * 敏感词标记 + * + * @author minghu.zhang + */ +public class FlagIndex { + + /** + * 标记结果 + */ + private boolean flag; + /** + * 是否黑名单词汇 + */ + private boolean isWhiteWord; + /** + * 标记索引 + */ + private List index; + + public boolean isFlag() { + return flag; + } + + public void setFlag(boolean flag) { + this.flag = flag; + } + + public List getIndex() { + return index; + } + + public void setIndex(List index) { + this.index = index; + } + + public boolean isWhiteWord() { + return isWhiteWord; + } + + public void setWhiteWord(boolean whiteWord) { + isWhiteWord = whiteWord; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java new file mode 100644 index 00000000..fe4e4960 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java @@ -0,0 +1,194 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.*; +/** + * 词库上下文环境 + *

+ * 初始化敏感词库，将敏感词加入到HashMap中，构建DFA算法模型 + * + * @author minghu.zhang + */ +@SuppressWarnings({"rawtypes", "unchecked"}) +public class WordContext { + + /** + * 敏感词字典 + */ + private final Map wordMap = new HashMap(1024); + + /** + * 是否已初始化 + */ + private boolean init; + /** + * 黑名单列表 + */ + private final String blackList; + /** + * 白名单列表 + */ + private final String whiteList; + + public WordContext() { + this.blackList = "/blacklist.txt"; + this.whiteList = "/whitelist.txt"; + initKeyWord(); + } + + public WordContext(String blackList, String whiteList) { + this.blackList = blackList; + this.whiteList = whiteList; + initKeyWord(); + } + + /** + * 获取初始化的敏感词列表 + * + * @return 敏感词列表 + */ + public Map getWordMap() { + return wordMap; + } + + /** + * 初始化 + */ + private synchronized void initKeyWord() { + try { + if (!init) { + // 将敏感词库加入到HashMap中 + addWord(readWordFile(blackList), WordType.BLACK); + // 将非敏感词库也加入到HashMap中 + addWord(readWordFile(whiteList), WordType.WHITE); + } + init = true; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * 读取敏感词库，将敏感词放入HashSet中，构建一个DFA算法模型：
+ * 中 = { isEnd = 0 国 = {
+ * isEnd = 1 人 = {isEnd = 0 民 = {isEnd = 1} } 男 = { isEnd = 0 人 = { isEnd = 1 } + * } } } 五 = { isEnd = 0 星 = { isEnd = 0 红 = { isEnd = 0 旗 = { isEnd = 1 } } } } + */ + public void addWord(Iterable wordList, WordType wordType) { + Map nowMap; + Map newWorMap; + // 迭代keyWordSet + for (String key : wordList) { + nowMap = wordMap; + for (int i = 0; i < key.length(); i++) { + // 转换成char型 + char keyChar = key.charAt(i); + // 获取 + Object wordMap = nowMap.get(keyChar); + // 如果存在该key，直接赋值 + if (wordMap != null) { + nowMap = (Map) wordMap; + } else { + // 不存在则构建一个map，同时将isEnd设置为0，因为他不是最后一个 + newWorMap = new HashMap<>(4); + // 不是最后一个 + newWorMap.put("isEnd", String.valueOf(EndType.HAS_NEXT.ordinal())); + nowMap.put(keyChar, newWorMap); + nowMap = newWorMap; + } + + if (i == key.length() - 1) { + // 最后一个 + nowMap.put("isEnd", String.valueOf(EndType.IS_END.ordinal())); + nowMap.put("isWhiteWord", String.valueOf(wordType.ordinal())); + } + } + } + } + + /** + * 在线删除敏感词 + * + * @param wordList 敏感词列表 + * @param wordType 黑名单 BLACk，白名单WHITE + */ + public void removeWord(Iterable wordList, WordType wordType) { + Map nowMap; + for (String key : wordList) { + List cacheList = new ArrayList<>(); + nowMap = wordMap; + for (int i = 0; i < key.length(); i++) { + char keyChar = key.charAt(i); + + Object map = nowMap.get(keyChar); + if (map != null) { + nowMap = (Map) map; + cacheList.add(nowMap); + } else { + return; + } + + if (i == key.length() - 1) { + char[] keys = key.toCharArray(); + boolean cleanable = false; + char lastChar = 0; + for (int j = cacheList.size() - 1; j >= 0; j--) { + Map cacheMap = cacheList.get(j); + if (j == cacheList.size() - 1) { + if (String.valueOf(WordType.BLACK.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (wordType == WordType.WHITE) { + return; + } + } + if (String.valueOf(WordType.WHITE.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (wordType == WordType.BLACK) { + return; + } + } + cacheMap.remove("isWhiteWord"); + cacheMap.remove("isEnd"); + if (cacheMap.size() == 0) { + cleanable = true; + continue; + } + } + if (cleanable) { + Object isEnd = cacheMap.get("isEnd"); + if (String.valueOf(EndType.IS_END.ordinal()).equals(isEnd)) { + cleanable = false; + } + cacheMap.remove(lastChar); + } + lastChar = keys[j]; + } + + if (cleanable) { + wordMap.remove(lastChar); + } + } + } + } + } + + /** + * 读取敏感词库中的内容，将内容添加到set集合中 + */ + private Set readWordFile(String file) throws Exception { + Set set; + // 字符编码 + String encoding = "UTF-8"; + try (InputStreamReader read = new InputStreamReader( + this.getClass().getResourceAsStream(file), encoding)) { + set = new HashSet<>(); + BufferedReader bufferedReader = new BufferedReader(read); + String txt; + // 读取文件，将文件内容放入到set中 + while ((txt = bufferedReader.readLine()) != null) { + set.add(txt); + } + } + // 关闭文件流 + return set; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java new file mode 100644 index 00000000..9f871574 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java @@ -0,0 +1,214 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 敏感词过滤器 + * + * @author minghu.zhang + */ +@SuppressWarnings("rawtypes") +public class WordFilter { + + /** + * 敏感词表 + */ + private final Map wordMap; + + /** + * 构造函数 + */ + public WordFilter(WordContext context) { + this.wordMap = context.getWordMap(); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + */ + public String replace(final String text) { + return replace(text, 0, '*'); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + * @param symbol 替换符号 + */ + public String replace(final String text, final char symbol) { + return replace(text, 0, symbol); + } + + /** + * 替换敏感词 + * + * @param text 输入文本 + * @param skip 文本距离 + * @param symbol 替换符号 + */ + public String replace(final String text, final int skip, final char symbol) { + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if (!fi.isWhiteWord()) { + for (int j : fi.getIndex()) { + charset[j] = symbol; + } + } else { + i += fi.getIndex().size() - 1; + } + } + } + return new String(charset); + } + + /** + * 是否包含敏感词 + * + * @param text 输入文本 + */ + public boolean include(final String text) { + return include(text, 0); + } + + /** + * 是否包含敏感词 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public boolean include(final String text, final int skip) { + boolean include = false; + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if(fi.isFlag()) { + if (fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + include = true; + break; + } + } + } + return include; + } + + /** + * 获取敏感词数量 + * + * @param text 输入文本 + */ + public int wordCount(final String text) { + return wordCount(text, 0); + } + + /** + * 获取敏感词数量 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public int wordCount(final String text, final int skip) { + int count = 0; + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if(fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + count++; + } + } + } + return count; + } + + /** + * 获取敏感词列表 + * + * @param text 输入文本 + */ + public List wordList(final String text) { + return wordList(text, 0); + } + + /** + * 获取敏感词列表 + * + * @param text 输入文本 + * @param skip 文本距离 + */ + public List wordList(final String text, final int skip) { + List wordList = new ArrayList<>(); + char[] charset = text.toCharArray(); + for (int i = 0; i < charset.length; i++) { + FlagIndex fi = getFlagIndex(charset, i, skip); + if (fi.isFlag()) { + if(fi.isWhiteWord()) { + i += fi.getIndex().size() - 1; + } else { + StringBuilder builder = new StringBuilder(); + for (int j : fi.getIndex()) { + char word = text.charAt(j); + builder.append(word); + } + wordList.add(builder.toString()); + } + } + } + return wordList; + } + + /** + * 获取标记索引 + * + * @param charset 输入文本 + * @param begin 检测起始 + * @param skip 文本距离 + */ + private FlagIndex getFlagIndex(final char[] charset, final int begin, final int skip) { + FlagIndex fi = new FlagIndex(); + + Map current = wordMap; + boolean flag = false; + int count = 0; + List index = new ArrayList<>(); + for (int i = begin; i < charset.length; i++) { + char word = charset[i]; + Map mapTree = (Map) current.get(word); + if (count > skip || (i == begin && Objects.isNull(mapTree))) { + break; + } + if (Objects.nonNull(mapTree)) { + current = mapTree; + count = 0; + index.add(i); + } else { + count++; + if (flag && count > skip) { + break; + } + } + if ("1".equals(current.get("isEnd"))) { + flag = true; + } + if ("1".equals(current.get("isWhiteWord"))) { + fi.setWhiteWord(true); + break; + } + } + + fi.setFlag(flag); + fi.setIndex(index); + + return fi; + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java new file mode 100644 index 00000000..7284332c --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordType.java @@ -0,0 +1,15 @@ +package cn.bootx.platform.baseapi.core.chinaword.wordfilter; + +/** + * 词汇类型 + * + * @author minghu.zhang + * @date 11:37 2020/11/11 + **/ +public enum WordType { + + /** + * 黑名单/白名单 + */ + BLACK, WHITE +} diff --git a/pom.xml b/pom.xml index 00edca8f..2707c6ac 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cn.bootx.platform bootx-platform-parent pom - 1.3.2 + 1.3.3 bootx-platform -- Gitee From 3168580d505c985a6b7f81eabf1d0f69e387b01d Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Wed, 9 Aug 2023 17:21:44 +0800 Subject: [PATCH 19/35] =?UTF-8?q?build=20=E6=96=B0=E5=A2=9E=E6=95=8F?= =?UTF-8?q?=E6=84=9F=E8=AF=8D=E5=A4=84=E7=90=86,=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=81=97=E7=95=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 2 + .../code/gen/code/CodeGenTemplateVmEnum.java | 3 - .../codegen/template/java/controller.java.vm | 4 +- .../codegen/template/java/service.java.vm | 4 +- .../resources/codegen/template/vue2/api.js.vm | 66 -------- .../codegen/template/vue2/edit.vue.vm | 108 ------------- .../codegen/template/vue2/list.vue.vm | 111 ------------- .../codegen/template/vue3/list.vue.vm | 2 +- bootx-demo/pom.xml | 14 +- .../platform/baseapi/code/WordFilterCode.java | 13 ++ .../controller/ChinaWordController.java | 82 ++++++++++ .../chinaword/convert/ChinaWordConvert.java | 22 +++ .../core/chinaword/dao/ChinaWordManager.java | 39 +++++ .../core/chinaword/dao/ChinaWordMapper.java | 14 ++ .../core/chinaword/entity/ChinaWord.java | 42 +++-- .../chinaword/service/ChinaWordService.java | 147 ++++++++++++++++++ .../core/chinaword/wordfilter/FlagIndex.java | 28 +--- .../chinaword/wordfilter/WordContext.java | 109 ++++--------- .../core/chinaword/wordfilter/WordFilter.java | 33 ++-- .../ChinaWordDto.java} | 36 ++--- .../dto/chinaword/ChinaWordVerifyResult.java | 23 +++ .../ChinaWordParam.java} | 34 ++-- 22 files changed, 469 insertions(+), 467 deletions(-) delete mode 100644 bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/api.js.vm delete mode 100644 bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/edit.vue.vm delete mode 100644 bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/list.vue.vm create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/WordFilterCode.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordConvert.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordManager.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordMapper.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java rename bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/{app/AppVersionDto.java => chinaword/ChinaWordDto.java} (40%) create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java rename bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/{app/AppVersionParam.java => chinaword/ChinaWordParam.java} (31%) diff --git a/_doc/Task.md b/_doc/Task.md index a2f67693..0807aa39 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -20,3 +20,5 @@ - 一键缓存同步和更新操作(字典/参数) - 加密模块支持主键加密 - Knife4j移植官方basic认证功能 +- 多次输错密码自动锁定功能 +- 密码多少天必须更改，且不能与前N次相同功能 diff --git a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java index bf50054f..5cd52a82 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java +++ b/bootx-common-starters/common-starter-code-gen/src/main/java/cn/bootx/platform/starter/code/gen/code/CodeGenTemplateVmEnum.java @@ -25,9 +25,6 @@ public enum CodeGenTemplateVmEnum { DTO("dto", "codegen/template/java/dto.java.vm", "Dto.java"), PARAM("param", "codegen/template/java/param.java.vm", "Param.java"), CONVERT("convert", "codegen/template/java/convert.java.vm", "Convert.java"), - API_V2("api_v2", "codegen/template/vue2/api.js.vm", ".js"), - LIST_V2("list_v2", "codegen/template/vue2/list.vue.vm", "List.vue"), - EDIT_V2("edit_v2", "codegen/template/vue2/edit.vue.vm", "Edit.vue"), API_V3("api_v3", "codegen/template/vue3/api.ts.vm", ".api.ts"), LIST_V3("list_v3", "codegen/template/vue3/list.vue.vm", "List.vue"), EDIT_V3("edit_v3", "codegen/template/vue3/edit.vue.vm", "Edit.vue"); diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm index fad161c6..bb0221b5 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm @@ -61,7 +61,7 @@ public class ${entityUpName}Controller { @Operation( summary = "分页查询") @GetMapping(value = "/page") - public ResResult> page(PageParam pageParam, ${entityUpName}Param ${entityLowName}Param){ - return Res.ok(${entityLowName}Service.page(pageParam,${entityLowName}Param)); + public ResResult> page(PageParam pageParam, ${entityUpName}Param query){ + return Res.ok(${entityLowName}Service.page(pageParam,query)); } } diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm index 23d54eb0..93ba8706 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm @@ -49,8 +49,8 @@ public class ${entityUpName}Service { /** * 分页 */ - public PageResult<${entityUpName}Dto> page(PageParam pageParam,${entityUpName}Param ${entityLowName}Param){ - return MpUtil.convert2DtoPageResult(${entityLowName}Manager.page(pageParam,${entityLowName}Param)); + public PageResult<${entityUpName}Dto> page(PageParam pageParam,${entityUpName}Param query){ + return MpUtil.convert2DtoPageResult(${entityLowName}Manager.page(pageParam,query)); } /** diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/api.js.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/api.js.vm deleted file mode 100644 index 5d7e008b..00000000 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/api.js.vm +++ /dev/null @@ -1,66 +0,0 @@ -import { axios } from '@/utils/request' - -/** - * 分页 - */ -export function page (params) { - return axios({ - url: '${requestPath}/page', - method: 'GET', - params: params - }) -} - -/** - * 查询全部 - */ -export function list () { - return axios({ - url: '${requestPath}/findAll', - method: 'GET' - }) -} - -/** - * 获取单条 - */ -export function get (id) { - return axios({ - url: '${requestPath}/findById', - method: 'GET', - params: { id } - }) -} - -/** - * 添加 - */ -export function add (obj) { - return axios({ - url: '${requestPath}/add', - method: 'POST', - data: obj - }) -} - -/** - * 更新 - */ -export function update (obj) { - return axios({ - url: '${requestPath}/update', - method: 'POST', - data: obj - }) -} - -/** - * 删除 - */ -export function del (id) { - return axios({ - url: '${requestPath}/delete', - params: { id }, - method: 'DELETE' - }) -} diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/edit.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/edit.vue.vm deleted file mode 100644 index 146d022a..00000000 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/edit.vue.vm +++ /dev/null @@ -1,108 +0,0 @@ - - - - - diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/list.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/list.vue.vm deleted file mode 100644 index 5039c862..00000000 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue2/list.vue.vm +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm index 9edcc2a4..75fb9129 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm @@ -146,7 +146,7 @@ queryPage() }) #end - } + } diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index b7ed06cf..a2b09b39 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -22,6 +22,16 @@ lombok provided + + cn.bootx + mybatis-table-modify-mysql-boot-starter + + + com.baomidou + mybatis-plus-annotation + + + org.springframework.boot spring-boot-starter-data-mongodb @@ -66,9 +76,5 @@ cn.bootx.platform common-rabbitmq - - cn.bootx - mybatis-table-modify-mysql-boot-starter - diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/WordFilterCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/WordFilterCode.java new file mode 100644 index 00000000..fae961ee --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/WordFilterCode.java @@ -0,0 +1,13 @@ +package cn.bootx.platform.baseapi.code; + +/** + * 敏感词过滤器常量 + * @author xxm + * @since 2023/8/9 + */ +public interface WordFilterCode { + /** 白名单名词 */ + String IS_WHITE_WORD = "isWhiteWord"; + /** 是否结束 */ + String IS_END = "isEnd"; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java new file mode 100644 index 00000000..612f5778 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java @@ -0,0 +1,82 @@ +package cn.bootx.platform.baseapi.controller; + +import cn.bootx.platform.baseapi.core.chinaword.service.ChinaWordService; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 敏感词 + * @author xxm + * @since 2023-08-09 + */ +@Tag(name ="敏感词管理") +@RestController +@RequestMapping("/chinaword") +@RequiredArgsConstructor +public class ChinaWordController { + private final ChinaWordService chinaWordService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody ChinaWordParam param){ + chinaWordService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody ChinaWordParam param){ + chinaWordService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + chinaWordService.delete(id); + return Res.ok(); + } + + + @Operation( summary = "添加") + @PostMapping(value = "/verify") + public ResResult verify(@RequestBody ChinaWordParam param){ + chinaWordService.add(param); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(chinaWordService.findById(id)); + } + + @Operation( summary = "刷新缓存") + @PostMapping(value = "/refresh") + public ResResult refresh(){ + chinaWordService.refresh(); + return Res.ok(); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(chinaWordService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, ChinaWordParam query){ + return Res.ok(chinaWordService.page(pageParam,query)); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordConvert.java new file mode 100644 index 00000000..8ea78d82 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.baseapi.core.chinaword.convert; + +import cn.bootx.platform.baseapi.core.chinaword.entity.ChinaWord; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 敏感词 + * @author xxm + * @since 2023-08-09 + */ +@Mapper +public interface ChinaWordConvert { + ChinaWordConvert CONVERT = Mappers.getMapper(ChinaWordConvert.class); + + ChinaWord convert(ChinaWordParam in); + + ChinaWordDto convert(ChinaWord in); + +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordManager.java new file mode 100644 index 00000000..4f85fecd --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordManager.java @@ -0,0 +1,39 @@ +package cn.bootx.platform.baseapi.core.chinaword.dao; + +import cn.bootx.platform.baseapi.core.chinaword.entity.ChinaWord; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 敏感词 + * @author xxm + * @since 2023-08-09 + */ +@Repository +@RequiredArgsConstructor +public class ChinaWordManager extends BaseManager { + + public List findAllByEnable(boolean enable){ + return findAllByField(ChinaWord::getEnable,enable); + } + + /** + * 分页 + */ + public Page page(PageParam pageParam, ChinaWordParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, ChinaWord.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(ChinaWord::getId)); + return this.page(mpPage,wrapper); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordMapper.java new file mode 100644 index 00000000..68ba3bab --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/dao/ChinaWordMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.baseapi.core.chinaword.dao; + +import cn.bootx.platform.baseapi.core.chinaword.entity.ChinaWord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 敏感词 + * @author xxm + * @since 2023-08-09 + */ +@Mapper +public interface ChinaWordMapper extends BaseMapper { +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java index 0d3049a8..f6830e72 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java @@ -1,16 +1,18 @@ package cn.bootx.platform.baseapi.core.chinaword.entity; +import cn.bootx.mybatis.table.modify.annotation.DbColumn; import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.platform.baseapi.core.chinaword.convert.ChinaWordConvert; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; -import cn.bootx.platform.common.mybatisplus.handler.StringListTypeHandler; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.List; - /** * 敏感词 * @author xxm @@ -20,20 +22,32 @@ import java.util.List; @Data @DbTable(comment = "敏感词") @Accessors(chain = true) -@TableName(value = "base_china_word",autoResultMap = true) -public class ChinaWord extends MpDelEntity { +@TableName(value = "base_black_china_word",autoResultMap = true) +public class ChinaWord extends MpDelEntity implements EntityBaseFunction { /** 敏感词 */ - private String name; + @DbColumn(comment = "敏感词") + private String word; + /** 类型 */ + @DbColumn(comment = "分类") + private String type; /** 描述 */ + @DbColumn(comment = "描述") private String description; - /** - * 标签数组 - * 不同的业务场景下，需要启用不同标签的敏感词。 - * - */ - @TableField(typeHandler = StringListTypeHandler.class) - private List tags; /** 是否启用 */ + @DbColumn(comment = "是否启用") private Boolean enable; + @Schema(description = "是否是白名单名词") + private Boolean white; + + /** 创建对象 */ + public static ChinaWord init(ChinaWordParam in) { + return ChinaWordConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public ChinaWordDto toDto() { + return ChinaWordConvert.CONVERT.convert(this); + } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java new file mode 100644 index 00000000..640af0c7 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java @@ -0,0 +1,147 @@ +package cn.bootx.platform.baseapi.core.chinaword.service; + +import cn.bootx.platform.baseapi.core.chinaword.dao.ChinaWordManager; +import cn.bootx.platform.baseapi.core.chinaword.entity.ChinaWord; +import cn.bootx.platform.baseapi.core.chinaword.wordfilter.WordContext; +import cn.bootx.platform.baseapi.core.chinaword.wordfilter.WordFilter; +import cn.bootx.platform.baseapi.core.chinaword.wordfilter.WordType; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordVerifyResult; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 敏感词服务 + * @author xxm + * @since 2023/8/9 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class ChinaWordService { + private final WordContext wordContext; + private final WordFilter wordFilter; + + private final ChinaWordManager chinaWordManager; + + /** + * 添加 + */ + public void add(ChinaWordParam param){ + ChinaWord chinaWord = ChinaWord.init(param); + this.updateWord(chinaWord); + chinaWordManager.save(chinaWord); + + } + + /** + * 修改 + */ + public void update(ChinaWordParam param){ + ChinaWord ChinaWord = chinaWordManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + BeanUtil.copyProperties(param,ChinaWord, CopyOptions.create().ignoreNullValue()); + refresh(); + chinaWordManager.updateById(ChinaWord); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam, ChinaWordParam query){ + return MpUtil.convert2DtoPageResult(chinaWordManager.page(pageParam,query)); + } + + /** + * 获取单条 + */ + public ChinaWordDto findById(Long id){ + return chinaWordManager.findById(id).map(ChinaWord::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(chinaWordManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + refresh(); + chinaWordManager.deleteById(id); + } + + /** + * 测试敏感词效果 + */ + public ChinaWordVerifyResult verify(String text, int skip, char symbol){ + ChinaWordVerifyResult result = new ChinaWordVerifyResult(); + if (wordFilter.include(text,skip)) { + String replaceText = wordFilter.replace(text, skip, symbol); + int count = wordFilter.wordCount(text, skip); + result.setText(replaceText) + .setCount(count) + .setSensitive(true); + } + return result; + } + + /** + * 刷新缓存 + */ + public void refresh(){ + initData(); + } + + /** + * 更新敏感词库 + */ + public void updateWord(ChinaWord chinaWord){ + if (Objects.equals(chinaWord.getEnable(),true)){ + if (Objects.equals(chinaWord.getWhite(),true)){ + wordContext.addWord(Collections.singleton(chinaWord.getWord()), WordType.WHITE); + } else { + wordContext.addWord(Collections.singleton(chinaWord.getWord()), WordType.BLACK); + } + } + } + + /** + * 初始化数据 + */ + @EventListener(WebServerInitializedEvent.class) + public void initData(){ + List chinaWords = chinaWordManager.findAllByEnable(true); + // 黑名单 + Set black = chinaWords.stream() + .filter(o -> Objects.equals(o.getWhite(), false)) + .map(ChinaWord::getWord) + .collect(Collectors.toSet()); + // 白名单 + Set white = chinaWords.stream() + .filter(o -> Objects.equals(o.getWhite(), true)) + .map(ChinaWord::getWord) + .collect(Collectors.toSet()); + + wordContext.initKeyWord(black,white); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java index 19d0450e..be55975a 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/FlagIndex.java @@ -1,5 +1,8 @@ package cn.bootx.platform.baseapi.core.chinaword.wordfilter; +import lombok.Getter; +import lombok.Setter; + import java.util.List; /** @@ -7,6 +10,8 @@ import java.util.List; * * @author minghu.zhang */ +@Getter +@Setter public class FlagIndex { /** @@ -22,27 +27,4 @@ public class FlagIndex { */ private List index; - public boolean isFlag() { - return flag; - } - - public void setFlag(boolean flag) { - this.flag = flag; - } - - public List getIndex() { - return index; - } - - public void setIndex(List index) { - this.index = index; - } - - public boolean isWhiteWord() { - return isWhiteWord; - } - - public void setWhiteWord(boolean whiteWord) { - isWhiteWord = whiteWord; - } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java index fe4e4960..8dc69860 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordContext.java @@ -1,8 +1,17 @@ package cn.bootx.platform.baseapi.core.chinaword.wordfilter; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.*; +import lombok.Getter; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static cn.bootx.platform.baseapi.code.WordFilterCode.IS_END; +import static cn.bootx.platform.baseapi.code.WordFilterCode.IS_WHITE_WORD; + /** * 词库上下文环境 *

@@ -10,6 +19,9 @@ import java.util.*; * * @author minghu.zhang */ +@Getter +@Service +@Component @SuppressWarnings({"rawtypes", "unchecked"}) public class WordContext { @@ -19,51 +31,15 @@ public class WordContext { private final Map wordMap = new HashMap(1024); /** - * 是否已初始化 - */ - private boolean init; - /** - * 黑名单列表 - */ - private final String blackList; - /** - * 白名单列表 - */ - private final String whiteList; - - public WordContext() { - this.blackList = "/blacklist.txt"; - this.whiteList = "/whitelist.txt"; - initKeyWord(); - } - - public WordContext(String blackList, String whiteList) { - this.blackList = blackList; - this.whiteList = whiteList; - initKeyWord(); - } - - /** - * 获取初始化的敏感词列表 - * - * @return 敏感词列表 + * 初始化敏感词库 */ - public Map getWordMap() { - return wordMap; - } - - /** - * 初始化 - */ - private synchronized void initKeyWord() { + public synchronized void initKeyWord(Iterable blackList,Iterable whiteList) { try { - if (!init) { - // 将敏感词库加入到HashMap中 - addWord(readWordFile(blackList), WordType.BLACK); - // 将非敏感词库也加入到HashMap中 - addWord(readWordFile(whiteList), WordType.WHITE); - } - init = true; + wordMap.clear(); + // 将敏感词库加入到HashMap中 + addWord(blackList, WordType.BLACK); + // 将非敏感词库也加入到HashMap中 + addWord(whiteList, WordType.WHITE ); } catch (Exception e) { throw new RuntimeException(e); } @@ -75,7 +51,7 @@ public class WordContext { * isEnd = 1 人 = {isEnd = 0 民 = {isEnd = 1} } 男 = { isEnd = 0 人 = { isEnd = 1 } * } } } 五 = { isEnd = 0 星 = { isEnd = 0 红 = { isEnd = 0 旗 = { isEnd = 1 } } } } */ - public void addWord(Iterable wordList, WordType wordType) { + public synchronized void addWord(Iterable wordList, WordType wordType) { Map nowMap; Map newWorMap; // 迭代keyWordSet @@ -93,15 +69,15 @@ public class WordContext { // 不存在则构建一个map，同时将isEnd设置为0，因为他不是最后一个 newWorMap = new HashMap<>(4); // 不是最后一个 - newWorMap.put("isEnd", String.valueOf(EndType.HAS_NEXT.ordinal())); + newWorMap.put(IS_END, String.valueOf(EndType.HAS_NEXT.ordinal())); nowMap.put(keyChar, newWorMap); nowMap = newWorMap; } if (i == key.length() - 1) { // 最后一个 - nowMap.put("isEnd", String.valueOf(EndType.IS_END.ordinal())); - nowMap.put("isWhiteWord", String.valueOf(wordType.ordinal())); + nowMap.put(IS_END, String.valueOf(EndType.IS_END.ordinal())); + nowMap.put(IS_WHITE_WORD, String.valueOf(wordType.ordinal())); } } } @@ -136,25 +112,25 @@ public class WordContext { for (int j = cacheList.size() - 1; j >= 0; j--) { Map cacheMap = cacheList.get(j); if (j == cacheList.size() - 1) { - if (String.valueOf(WordType.BLACK.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (String.valueOf(WordType.BLACK.ordinal()).equals(cacheMap.get(IS_WHITE_WORD))) { if (wordType == WordType.WHITE) { return; } } - if (String.valueOf(WordType.WHITE.ordinal()).equals(cacheMap.get("isWhiteWord"))) { + if (String.valueOf(WordType.WHITE.ordinal()).equals(cacheMap.get(IS_WHITE_WORD))) { if (wordType == WordType.BLACK) { return; } } - cacheMap.remove("isWhiteWord"); - cacheMap.remove("isEnd"); - if (cacheMap.size() == 0) { + cacheMap.remove(IS_WHITE_WORD); + cacheMap.remove(IS_END); + if (cacheMap.isEmpty()) { cleanable = true; continue; } } if (cleanable) { - Object isEnd = cacheMap.get("isEnd"); + Object isEnd = cacheMap.get(IS_END); if (String.valueOf(EndType.IS_END.ordinal()).equals(isEnd)) { cleanable = false; } @@ -170,25 +146,4 @@ public class WordContext { } } } - - /** - * 读取敏感词库中的内容，将内容添加到set集合中 - */ - private Set readWordFile(String file) throws Exception { - Set set; - // 字符编码 - String encoding = "UTF-8"; - try (InputStreamReader read = new InputStreamReader( - this.getClass().getResourceAsStream(file), encoding)) { - set = new HashSet<>(); - BufferedReader bufferedReader = new BufferedReader(read); - String txt; - // 读取文件，将文件内容放入到set中 - while ((txt = bufferedReader.readLine()) != null) { - set.add(txt); - } - } - // 关闭文件流 - return set; - } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java index 9f871574..b787918e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java @@ -1,5 +1,8 @@ package cn.bootx.platform.baseapi.core.chinaword.wordfilter; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,21 +13,11 @@ import java.util.Objects; * * @author minghu.zhang */ +@Component +@RequiredArgsConstructor @SuppressWarnings("rawtypes") public class WordFilter { - - /** - * 敏感词表 - */ - private final Map wordMap; - - /** - * 构造函数 - */ - public WordFilter(WordContext context) { - this.wordMap = context.getWordMap(); - } - + private final WordContext context; /** * 替换敏感词 * @@ -36,6 +29,11 @@ public class WordFilter { /** * 替换敏感词 + * 查找敏感词，距离越长，过滤越严格，效率越低，开发者可以根据具体需求设置， + * 这里以“紧急”为敏感词举例，以此类推: + * 0 匹配紧急 + * 1 匹配不紧不急，紧x急 + * 2 匹配紧急，紧x急，紧xx急 * * @param text 输入文本 * @param symbol 替换符号 @@ -78,7 +76,12 @@ public class WordFilter { } /** - * 是否包含敏感词 + * 是否包含敏感词, 程序会跳过不同的距离， + * 查找敏感词，距离越长，过滤越严格，效率越低，开发者可以根据具体需求设置， + * 这里以“紧急”为敏感词举例，以此类推: + * 0 匹配紧急 + * 1 匹配不紧不急，紧x急 + * 2 匹配紧急，紧x急，紧xx急 * * @param text 输入文本 * @param skip 文本距离 @@ -177,7 +180,7 @@ public class WordFilter { private FlagIndex getFlagIndex(final char[] charset, final int begin, final int skip) { FlagIndex fi = new FlagIndex(); - Map current = wordMap; + Map current = context.getWordMap(); boolean flag = false; int count = 0; List index = new ArrayList<>(); diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordDto.java similarity index 40% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordDto.java index cf511e75..f31a395b 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/app/AppVersionDto.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordDto.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.baseapi.dto.app; +package cn.bootx.platform.baseapi.dto.chinaword; import cn.bootx.platform.common.core.rest.dto.BaseDto; import io.swagger.v3.oas.annotations.media.Schema; @@ -6,33 +6,25 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.io.Serializable; - /** + * 敏感词 * @author xxm - * @since 2021/8/9 + * @since 2023-08-09 */ @EqualsAndHashCode(callSuper = true) @Data +@Schema(title = "敏感词") @Accessors(chain = true) -@Schema(title = "app版本") -public class AppVersionDto extends BaseDto implements Serializable { - - private static final long serialVersionUID = -7287549085443499458L; - - /** app版本 */ - private String appVersion; - - /** 下载地址 */ - private String url; +public class ChinaWordDto extends BaseDto { - /** 密码 */ - private String password; - - /** 包名 */ - private String bundleId; - - /** 说明 */ + @Schema(description = "敏感词") + private String word; + @Schema(description = "分类") + private String type; + @Schema(description = "描述") private String description; - + @Schema(description = "是否启用") + private Boolean enable; + @Schema(description = "是否是白名单名词") + private Boolean white; } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java new file mode 100644 index 00000000..e2a511c9 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.baseapi.dto.chinaword; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 敏感词验证结果 + * @author xxm + * @since 2023/8/9 + */ +@Data +@Accessors(chain = true) +@Schema(title = "敏感词验证结果") +public class ChinaWordVerifyResult { + + @Schema(description = "是否敏感") + private boolean sensitive; + @Schema(description = "敏感词数量") + private Integer count; + @Schema(description = "脱敏后的文本") + private String text; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java similarity index 31% rename from bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java rename to bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java index 8bca41b1..96fe607e 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/app/AppVersionParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java @@ -1,35 +1,31 @@ -package cn.bootx.platform.baseapi.param.app; +package cn.bootx.platform.baseapi.param.chinaword; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; /** - * app版本参数 - * + * 敏感词 * @author xxm - * @since 2021/8/9 + * @since 2023-08-09 */ @Data +@Schema(title = "敏感词") @Accessors(chain = true) -@Schema(title = "app版本参数") -public class AppVersionParam { +public class ChinaWordParam { + @Schema(description= "主键") private Long id; - /** app版本 */ - private String appVersion; - - /** 下载地址 */ - private String url; - - /** 密码 */ - private String password; - - /** 包名 */ - private String bundleId; - - /** 说明 */ + @Schema(description = "敏感词") + private String word; + @Schema(description = "分类") + private String type; + @Schema(description = "描述") private String description; + @Schema(description = "是否启用") + private Boolean enable; + @Schema(description = "是否是白名单名词") + private Boolean white; } -- Gitee From 154930ce2692b4f5a6c9f35c87555abf2825cf49 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Thu, 10 Aug 2023 20:10:35 +0800 Subject: [PATCH 20/35] =?UTF-8?q?feat=20=E6=95=8F=E6=84=9F=E8=AF=8D?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChinaWordController.java | 16 ++++++------- .../dto/chinaword/ChinaWordVerifyResult.java | 2 +- .../param/chinaword/ChinaWordVerifyParam.java | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordVerifyParam.java diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java index 612f5778..ba9dad85 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java @@ -2,7 +2,9 @@ package cn.bootx.platform.baseapi.controller; import cn.bootx.platform.baseapi.core.chinaword.service.ChinaWordService; import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; +import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordVerifyResult; import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordVerifyParam; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; @@ -47,14 +49,6 @@ public class ChinaWordController { return Res.ok(); } - - @Operation( summary = "添加") - @PostMapping(value = "/verify") - public ResResult verify(@RequestBody ChinaWordParam param){ - chinaWordService.add(param); - return Res.ok(); - } - @Operation( summary = "通过ID查询") @GetMapping(value = "/findById") public ResResult findById(Long id){ @@ -68,6 +62,12 @@ public class ChinaWordController { return Res.ok(); } + @Operation( summary = "测试敏感词效果") + @PostMapping(value = "/verify") + public ResResult verify(@RequestBody ChinaWordVerifyParam param){ + return Res.ok(chinaWordService.verify(param.getText(),param.getSkip(),param.getSymbol())); + } + @Operation( summary = "查询所有") @GetMapping(value = "/findAll") public ResResult> findAll(){ diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java index e2a511c9..e10767a5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java @@ -17,7 +17,7 @@ public class ChinaWordVerifyResult { @Schema(description = "是否敏感") private boolean sensitive; @Schema(description = "敏感词数量") - private Integer count; + private int count; @Schema(description = "脱敏后的文本") private String text; } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordVerifyParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordVerifyParam.java new file mode 100644 index 00000000..46d2465a --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordVerifyParam.java @@ -0,0 +1,24 @@ +package cn.bootx.platform.baseapi.param.chinaword; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 敏感词验证参数类 + * @author xxm + * @since 2023/8/10 + */ +@Data +@Accessors(chain = true) +@Schema(title = "敏感词验证参数类") +public class ChinaWordVerifyParam { + @Schema(description = "文本") + private String text; + + @Schema(description = "间隔距离") + private int skip = 0; + + @Schema(description = "替换字符") + private char symbol = '*'; +} -- Gitee From 7f83754cacb3feefa7e1c6f7a42c4423482bf847 Mon Sep 17 00:00:00 2001 From: xxm Date: Sun, 13 Aug 2023 17:12:24 +0800 Subject: [PATCH 21/35] =?UTF-8?q?feat=20=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86,=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=96=B0,=20=E6=95=8F?= =?UTF-8?q?=E6=84=9F=E8=AF=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 44 +++---- _doc/Task.md | 9 +- .../codegen/template/java/controller.java.vm | 7 ++ .../codegen/template/java/service.java.vm | 8 ++ .../resources/codegen/template/vue3/api.ts.vm | 10 ++ .../codegen/template/vue3/list.vue.vm | 59 ++++++++- .../starter/file/entity/JdbcFileData.java | 4 +- .../cache/TranslationCacheService.java | 1 + .../baseapi/code/GeneralTemplateCode.java | 17 +++ .../controller/ChinaWordController.java | 24 ++++ .../controller/GeneralTemplateController.java | 94 +++++++++++++++ .../convert/ChinaWordImportType.java | 30 +++++ .../core/chinaword/entity/ChinaWord.java | 2 +- .../chinaword/service/ChinaWordService.java | 22 ++++ .../convert/GeneralTemplateConvert.java | 22 ++++ .../template/dao/GeneralTemplateManager.java | 47 ++++++++ .../template/dao/GeneralTemplateMapper.java | 14 +++ .../core/template/entity/GeneralTemplate.java | 79 ++++++++++++ .../service/GeneralTemplateService.java | 112 ++++++++++++++++++ .../dto/template/GeneralTemplateDto.java | 41 +++++++ .../param/chinaword/ChinaWordImportParam.java | 19 +++ .../param/template/GeneralTemplateParam.java | 37 ++++++ 22 files changed, 674 insertions(+), 28 deletions(-) create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/GeneralTemplateCode.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/GeneralTemplateController.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordImportType.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/convert/GeneralTemplateConvert.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateManager.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateMapper.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/service/GeneralTemplateService.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/template/GeneralTemplateDto.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordImportParam.java create mode 100644 bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/template/GeneralTemplateParam.java diff --git a/README.md b/README.md index 8823950b..33775ca8 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,10 @@ ## 🙏🙏🙏 求star呀，走过路过留个star吧，非常非常感谢。🙏🙏🙏 ## 🍈项目介绍 -> 目前Bootx-Platform的开发重点是，将核心中的业务代码剥离出子项目，作为单独系统使用， -保持脚手架核心的精简，同时对不同的业务模块也可以专门优化和适配，使其加易用和强大。 - -基于Spring Boot框架打造，针对单体式应用进行专门设计，提供整套服务模块，努力为打造全方位企业级开发解决方案， +> 基于Spring Boot框架打造，针对单体式应用进行专门设计，提供整套服务模块，努力为打造全方位企业级开发解决方案， 致力将开源版打造成超越商业版后台管理框架的项目。 - 单体版本使用Spring Boot相关技术栈 -- vue2使用 [ANTD PRO VUE](https://pro.antdv.com/) 作为脚手架 - vue3使用 [Vben-Admin](https://vvbin.cn/doc-next/) 作为脚手架 - 可视化大屏使用 [Go-VIew](https://gitee.com/dromara/go-view) 作为基础框架 - 移动端使用 [Taro](https://taro.jd.com/)、[NutUI](https://nutui.jd.com/) vue3+TS为技术栈。 @@ -30,19 +26,7 @@ - bpm-plus：协同办公系统 [Gitee地址](https://gitee.com/bootx/bpm-plus) - mybatis-table-modify：数据表结构管理 [Gitee地址](https://gitee.com/bootx/mybatis-table-modify) -## 项目Maven坐标 -> 项目各模块都已经发布到maven中央仓库中，进行二开时可以对不进行更改的模块，使用Maven方式进行引入，方便后续进行版本升级 - -例子： -```xml - - cn.bootx.platform - service.iam - ${latest.version} - -``` - -## 📚文档 +## 📚资料和文档 - 系统演示地址：[管理平台(vue3)](http://v3.platform.bootx.cn/)、[可视化大屏](http://visualization.platform.bootx.cn/) - 前端项目地址：[前端项目(vue3)](https://gitee.com/bootx/bootx-platform-vue3)、[可视化大屏](https://gitee.com/bootx/bootx-platform-visualization)、[前端项目(vue2只维护不再更新)](https://gitee.com/bootx/bootx-platform-ui) @@ -51,6 +35,10 @@ - 项目文档：[项目文档(GITEE)](https://bootx.gitee.io/)、[项目文档(备用)](https://doc.bootx.cn/) - 更新日志：[更新日志](./_doc/ChangeLog.md) +> 功能更新计划: [任务池](./_doc/Task.md) +> +> 历史更新记录: [更新日志](./_doc/ChangeLog.md) + ## 🛠️功能亮点 低代码可视化平台，基于`GoView`开发，可以通过托拉拽来生成常用的大屏，可以适用于需要快速开发各种数据看板的场景。 @@ -73,11 +61,25 @@ - 集成Flowable+Bpmn.js工作流全家桶，方便OA相关功能的开发 - 基于GoView打造低代码可视化大屏平台，快速生成各种数据展板和大屏 -## 🥂 Quick Start -Spring Boot后端: [后端启动流程](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) +## 🧭 项目Maven坐标 +> 项目各模块都已经发布到maven中央仓库中，进行二开时可以对不进行更改的模块，使用Maven方式进行引入，方便后续进行版本升级 + +例子： +```xml + + cn.bootx.platform + service.iam + ${latest.version} + +``` + +## 🥂 Quick Start -Vue3后端: [Vue3前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备-1) +- Spring Boot后端: [后端启动流程](https://bootx.gitee.io/doc/overview/config/项目启动.html#后端启动) +- Vue3后端: [Vue3前端启动流程](https://bootx.gitee.io/doc/overview/config/%E9%A1%B9%E7%9B%AE%E5%90%AF%E5%8A%A8.html#环境准备-1) +- 可视化大屏: [可视化大屏启动流程]() +- 小程序移动端: [小程序启动流程]() ## 🥞项目模块结构 ```lua diff --git a/_doc/Task.md b/_doc/Task.md index 0807aa39..9a648961 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -3,7 +3,12 @@ - 小程序工单功能 - 小程序日报功能 - 小程序用户反馈功能 -- 敏感字功能 +- x 敏感字功能 +- 通用导入文件功能 + - 模板管理 +- 用户批量重置密码 +- 代码生成模板添加批量操作相关 +- 字典翻译 ## 1.3.x - PostgreSQL 数据库适配 - 添加短信模板功能, 可以与各短信商渠道进行同步 @@ -22,3 +27,5 @@ - Knife4j移植官方basic认证功能 - 多次输错密码自动锁定功能 - 密码多少天必须更改，且不能与前N次相同功能 +- 对上传的文件管理还需要完善, 例如改文件是否还被使用, 上传场景是什么样的一类 +- 前端首页分析页面需要重做，接入真实数据 diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm index bb0221b5..5f2aec47 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/controller.java.vm @@ -47,6 +47,13 @@ public class ${entityUpName}Controller { return Res.ok(); } + @Operation(summary = "批量删除") + @DeleteMapping("/deleteBatch") + public ResResult deleteBatch(@RequestBody List ids) { + ${entityLowName}Service.deleteBatch(ids); + return Res.ok(); + } + @Operation( summary = "通过ID查询") @GetMapping(value = "/findById") public ResResult<${entityUpName}Dto> findById(Long id){ diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm index 93ba8706..69dd1772 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/service.java.vm @@ -73,4 +73,12 @@ public class ${entityUpName}Service { public void delete(Long id){ ${entityLowName}Manager.deleteById(id); } + + + /** + * 批量删除 + */ + public void deleteBatch(List ids){ + ${entityLowName}Manager.deleteByIds(ids); + } } diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm index 225f4b7d..880972f8 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/api.ts.vm @@ -61,6 +61,16 @@ export function del(id) { }) } +/** + * 批量删除 + */ +export function deleteBatch(ids) { + return defHttp.delete({ + url: '${requestPath}/template/delete', + data: ids, + }) +} + /** * ${comments} */ diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm index 75fb9129..2b9a671c 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/vue3/list.vue.vm @@ -8,11 +8,28 @@ - - + + #foreach ($column in $columns) #end @@ -56,7 +73,7 @@ diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java index 3a731321..aa04aa3b 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java @@ -22,11 +22,13 @@ import lombok.experimental.Accessors; @TableName("starter_file_data") public class JdbcFileData extends MpIdEntity { + /** base64方式存储 */ @DbColumn(comment = "base64方式存储") @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) private String base64; - @DbColumn(comment = "base64方式存储") + /** 数据方式存储 */ + @DbColumn(comment = "数据方式存储") @DbMySqlFieldType(MySqlFieldTypeEnum.LONGBLOB) private byte[] data; } diff --git a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java index efe6202b..f2dd33c2 100644 --- a/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java +++ b/bootx-commons/common-data-translate/src/main/java/cn/bootx/platform/common/translate/cache/TranslationCacheService.java @@ -21,6 +21,7 @@ import java.util.Objects; import java.util.stream.Collectors; /** + * 翻译缓存服务 * @author xxm * @since 2023/1/30 */ diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/GeneralTemplateCode.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/GeneralTemplateCode.java new file mode 100644 index 00000000..866ef5a2 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/code/GeneralTemplateCode.java @@ -0,0 +1,17 @@ +package cn.bootx.platform.baseapi.code; + +/** + * 通用模板变量 + * @author xxm + * @since 2023/8/12 + */ +public interface GeneralTemplateCode { + + /** 模板类型 */ + String USE_TYPE_IMPORT = "import"; + String USE_TYPE_EXPORT = "export"; + + /** 启用状态 */ + String STATE_ENABLE = "enable"; + String STATE_DISABLE = "disable"; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java index ba9dad85..913fa896 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/ChinaWordController.java @@ -9,11 +9,19 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.hutool.core.io.IoUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import java.io.*; +import java.nio.file.Files; import java.util.List; /** @@ -79,4 +87,20 @@ public class ChinaWordController { public ResResult> page(PageParam pageParam, ChinaWordParam query){ return Res.ok(chinaWordService.page(pageParam,query)); } + + @Operation(summary = "批量导入") + @PostMapping("/importBatch") + public ResResult local(MultipartFile file, String type) throws IOException { + chinaWordService.importBatch(file, type); + return Res.ok(); + } + + @Operation(summary = "获取模板") + @GetMapping("/getTemplate") + public ResponseEntity getTemplate() throws IOException { + InputStream is = Files.newInputStream(new File("D:/data/洛阳工作量报价.xlsx").toPath()); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_OCTET_STREAM); + return new ResponseEntity<>(IoUtil.readBytes(is), headers, HttpStatus.OK); + } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/GeneralTemplateController.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/GeneralTemplateController.java new file mode 100644 index 00000000..dc0d2140 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/controller/GeneralTemplateController.java @@ -0,0 +1,94 @@ +package cn.bootx.platform.baseapi.controller; + +import cn.bootx.platform.baseapi.core.template.service.GeneralTemplateService; +import cn.bootx.platform.baseapi.dto.template.GeneralTemplateDto; +import cn.bootx.platform.baseapi.param.template.GeneralTemplateParam; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Tag(name ="通用模板管理") +@RestController +@RequestMapping("/general/template") +@RequiredArgsConstructor +public class GeneralTemplateController { + private final GeneralTemplateService generalTemplateService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody GeneralTemplateParam param){ + generalTemplateService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody GeneralTemplateParam param){ + generalTemplateService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + generalTemplateService.delete(id); + return Res.ok(); + } + + @Operation(summary = "批量删除") + @DeleteMapping("/deleteBatch") + public ResResult deleteBatch(@RequestBody List ids) { + generalTemplateService.deleteBatch(ids); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(generalTemplateService.findById(id)); + } + + @Operation( summary = "通过Code查询") + @GetMapping(value = "/findByCode") + public ResResult findByCode(String code){ + return Res.ok(generalTemplateService.findByCode(code)); + } + + + @Operation(summary = "编码是否被使用") + @GetMapping("/existsByCode") + public ResResult existsByCode(String code) { + return Res.ok(generalTemplateService.existsByCode(code)); + } + + @Operation(summary = "编码是否被使用(不包含自己)") + @GetMapping("/existsByCodeNotId") + public ResResult existsByCode(String code, Long id) { + return Res.ok(generalTemplateService.existsByCode(code, id)); + } + + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(generalTemplateService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, GeneralTemplateParam query){ + return Res.ok(generalTemplateService.page(pageParam,query)); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordImportType.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordImportType.java new file mode 100644 index 00000000..fbe10833 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/convert/ChinaWordImportType.java @@ -0,0 +1,30 @@ +package cn.bootx.platform.baseapi.core.chinaword.convert; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.converters.ReadConverterContext; +import com.alibaba.excel.enums.CellDataTypeEnum; + +public class ChinaWordImportType implements Converter { + + @Override + public Class supportJavaTypeKey() { + return String.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + /** + * 这里读的时候会调用 + * + * @param context + * @return + */ + @Override + public String convertToJavaData(ReadConverterContext context) { + + return "自定义：" + context.getReadCellData().getStringValue(); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java index f6830e72..749bf7d1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; @Data @DbTable(comment = "敏感词") @Accessors(chain = true) -@TableName(value = "base_black_china_word",autoResultMap = true) +@TableName(value = "base_china_word",autoResultMap = true) public class ChinaWord extends MpDelEntity implements EntityBaseFunction { /** 敏感词 */ diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java index 640af0c7..339bdd0c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java @@ -7,6 +7,7 @@ import cn.bootx.platform.baseapi.core.chinaword.wordfilter.WordFilter; import cn.bootx.platform.baseapi.core.chinaword.wordfilter.WordType; import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordDto; import cn.bootx.platform.baseapi.dto.chinaword.ChinaWordVerifyResult; +import cn.bootx.platform.baseapi.param.chinaword.ChinaWordImportParam; import cn.bootx.platform.baseapi.param.chinaword.ChinaWordParam; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; @@ -15,12 +16,18 @@ import cn.bootx.platform.common.core.util.ResultConvertUtil; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.event.SyncReadListener; import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.io.InputStream; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -51,6 +58,21 @@ public class ChinaWordService { } + /** + * 批量导入 + */ + @SneakyThrows + @Transactional(rollbackFor = Exception.class) + public void importBatch(MultipartFile file, String type){ + InputStream inputStream = file.getInputStream(); + //同步读取文件内容 + SyncReadListener syncReadListener = new SyncReadListener(); + EasyExcel.read(inputStream, syncReadListener) + .head(ChinaWordImportParam.class) + .sheet().doRead(); + syncReadListener.getList(); + } + /** * 修改 */ diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/convert/GeneralTemplateConvert.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/convert/GeneralTemplateConvert.java new file mode 100644 index 00000000..8e54a50f --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/convert/GeneralTemplateConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.baseapi.core.template.convert; + +import cn.bootx.platform.baseapi.core.template.entity.GeneralTemplate; +import cn.bootx.platform.baseapi.dto.template.GeneralTemplateDto; +import cn.bootx.platform.baseapi.param.template.GeneralTemplateParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Mapper +public interface GeneralTemplateConvert { + GeneralTemplateConvert CONVERT = Mappers.getMapper(GeneralTemplateConvert.class); + + GeneralTemplate convert(GeneralTemplateParam in); + + GeneralTemplateDto convert(GeneralTemplate in); + +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateManager.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateManager.java new file mode 100644 index 00000000..ab25026e --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateManager.java @@ -0,0 +1,47 @@ +package cn.bootx.platform.baseapi.core.template.dao; + +import cn.bootx.platform.baseapi.core.template.entity.GeneralTemplate; +import cn.bootx.platform.baseapi.param.template.GeneralTemplateParam; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Repository +@RequiredArgsConstructor +public class GeneralTemplateManager extends BaseManager { + + /** + * 分页 + */ + public Page page(PageParam pageParam, GeneralTemplateParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, GeneralTemplate.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(GeneralTemplate::getId)); + return this.page(mpPage,wrapper); + } + + public Optional findByCode(String code){ + return findByField(GeneralTemplate::getCode,code); + } + + public boolean existsByCode(String code) { + return existedByField(GeneralTemplate::getCode, code); + } + + public boolean existsByCode(String code, Long id) { + return existedByField(GeneralTemplate::getCode, code, id); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateMapper.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateMapper.java new file mode 100644 index 00000000..02b6a9a1 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/dao/GeneralTemplateMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.baseapi.core.template.dao; + +import cn.bootx.platform.baseapi.core.template.entity.GeneralTemplate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Mapper +public interface GeneralTemplateMapper extends BaseMapper { +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java new file mode 100644 index 00000000..d1ff1984 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java @@ -0,0 +1,79 @@ +package cn.bootx.platform.baseapi.core.template.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbComment; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.platform.baseapi.core.template.convert.GeneralTemplateConvert; +import cn.bootx.platform.baseapi.dto.template.GeneralTemplateDto; +import cn.bootx.platform.baseapi.param.template.GeneralTemplateParam; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 通用模板管理 + * @author xxm + * @since 2023/8/12 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@DbTable(comment = "通用模板管理") +@Accessors(chain = true) +@TableName("base_general_template") +public class GeneralTemplate extends MpBaseEntity implements EntityBaseFunction { + + /** 模板名称 */ + @DbComment("模板名称") + private String name; + + /** 模板代码 */ + @DbComment("模板代码") + private String code; + + /** + * 使用类型(导入/导出) + * @see cn.bootx.platform.baseapi.code.GeneralTemplateCode + */ + @DbComment("使用类型(导入/导出)") + private String useType; + + /** 模板类型 */ + @DbComment("模板类型") + private String fileType; + + /** 模板后缀名 */ + @DbComment("模板后缀名") + private String fileSuffix; + + /** + * 状态 + * @see cn.bootx.platform.baseapi.code.GeneralTemplateCode + */ + @DbComment("状态") + private String state; + + /** 文件ID */ + @DbComment("文件ID") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private Long fileId; + + /** 备注 */ + @DbComment("备注") + private String remark; + + + /** 创建对象 */ + public static GeneralTemplate init(GeneralTemplateParam in) { + return GeneralTemplateConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public GeneralTemplateDto toDto() { + return GeneralTemplateConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/service/GeneralTemplateService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/service/GeneralTemplateService.java new file mode 100644 index 00000000..f9761f82 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/service/GeneralTemplateService.java @@ -0,0 +1,112 @@ +package cn.bootx.platform.baseapi.core.template.service; + +import cn.bootx.platform.baseapi.core.template.dao.GeneralTemplateManager; +import cn.bootx.platform.baseapi.core.template.entity.GeneralTemplate; +import cn.bootx.platform.baseapi.dto.template.GeneralTemplateDto; +import cn.bootx.platform.baseapi.param.template.GeneralTemplateParam; +import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class GeneralTemplateService { + private final GeneralTemplateManager generalTemplateManager; + + /** + * 添加 + */ + public void add(GeneralTemplateParam param){ + if (generalTemplateManager.existsByCode(param.getCode())) { + throw new BizException("code重复"); + } + GeneralTemplate generalTemplate = GeneralTemplate.init(param); + generalTemplateManager.save(generalTemplate); + } + + /** + * 修改 + */ + public void update(GeneralTemplateParam param){ + if (generalTemplateManager.existsByCode(param.getCode(),param.getId())) { + throw new BizException("code重复"); + } + GeneralTemplate generalTemplate = generalTemplateManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + BeanUtil.copyProperties(param,generalTemplate, CopyOptions.create().ignoreNullValue()); + generalTemplateManager.updateById(generalTemplate); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,GeneralTemplateParam query){ + return MpUtil.convert2DtoPageResult(generalTemplateManager.page(pageParam,query)); + } + + /** + * 获取单条 + */ + public GeneralTemplateDto findById(Long id){ + return generalTemplateManager.findById(id).map(GeneralTemplate::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 根据编码获取 + */ + public GeneralTemplateDto findByCode(String code){ + return generalTemplateManager.findByCode(code).map(GeneralTemplate::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(generalTemplateManager.findAll()); + } + + + /** + * code是否存在 + */ + public boolean existsByCode(String code) { + return generalTemplateManager.existsByCode(code); + } + + /** + * code是否存在 + */ + public boolean existsByCode(String code, Long id) { + return generalTemplateManager.existsByCode(code, id); + } + + /** + * 删除 + */ + public void delete(Long id){ + generalTemplateManager.deleteById(id); + } + + /** + * 批量删除 + */ + public void deleteBatch(List ids){ + generalTemplateManager.deleteByIds(ids); + } + +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/template/GeneralTemplateDto.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/template/GeneralTemplateDto.java new file mode 100644 index 00000000..cb2ccfc7 --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/template/GeneralTemplateDto.java @@ -0,0 +1,41 @@ +package cn.bootx.platform.baseapi.dto.template; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDate; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "通用模板管理") +@Accessors(chain = true) +public class GeneralTemplateDto extends BaseDto { + + @Schema(description = "模板名称") + private String name; + @Schema(description = "模板代码") + private String code; + @Schema(description = "使用类型(导入/导出)") + private String useType; + @Schema(description = "模板类型") + private String fileType; + @Schema(description = "模板后缀名") + private String fileSuffix; + @Schema(description = "状态") + private String state; + @Schema(description = "文件ID") + private Long fileId; + @Schema(description = "备注") + private String remark; + +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordImportParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordImportParam.java new file mode 100644 index 00000000..5edd178b --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordImportParam.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.baseapi.param.chinaword; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +/** + * 敏感词导入参数 + * @author xxm + * @since 2023/8/12 + */ +@Data +public class ChinaWordImportParam { + @ExcelProperty(value = "类型") + private String type; + @ExcelProperty("黑/白名单") + private String whiteOrBlack; + @ExcelProperty("敏感词") + private String word; +} diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/template/GeneralTemplateParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/template/GeneralTemplateParam.java new file mode 100644 index 00000000..b5f7fbdf --- /dev/null +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/template/GeneralTemplateParam.java @@ -0,0 +1,37 @@ +package cn.bootx.platform.baseapi.param.template; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 通用模板管理 + * @author xxm + * @since 2023-08-12 + */ +@Data +@Schema(title = "通用模板管理") +@Accessors(chain = true) +public class GeneralTemplateParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "模板名称") + private String name; + @Schema(description = "模板代码") + private String code; + @Schema(description = "使用类型(导入/导出)") + private String useType; + @Schema(description = "模板类型") + private String fileType; + @Schema(description = "模板后缀名") + private String fileSuffix; + @Schema(description = "状态") + private String state; + @Schema(description = "文件ID") + private Long fileId; + @Schema(description = "备注") + private String remark; + +} -- Gitee From a3bb524a0aa68f398e2efefb1ba267c4c229c554 Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Tue, 15 Aug 2023 20:08:00 +0800 Subject: [PATCH 22/35] =?UTF-8?q?feat=20=E6=96=B0=E5=A2=9E=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=8F=8D=E9=A6=88.=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 18 ++-- bootx-services/pom.xml | 24 ++---- .../iam/controller/UserAdminController.java | 9 ++ .../controller/FeedbackInfoController.java | 74 ++++++++++++++++ .../feedback/convert/FeedbackInfoConvert.java | 22 +++++ .../feedback/dao/FeedbackInfoManager.java | 33 ++++++++ .../core/feedback/dao/FeedbackInfoMapper.java | 14 ++++ .../core/feedback/entity/FeedbackInfo.java | 63 ++++++++++++++ .../feedback/service/FeedbackInfoService.java | 84 +++++++++++++++++++ .../miniapp/dto/feedback/FeedbackInfoDto.java | 35 ++++++++ .../param/feedback/FeedbackInfoParam.java | 35 ++++++++ pom.xml | 20 ++--- 12 files changed, 393 insertions(+), 38 deletions(-) create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/convert/FeedbackInfoConvert.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoManager.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoMapper.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/service/FeedbackInfoService.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/feedback/FeedbackInfoDto.java create mode 100644 bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java diff --git a/_doc/Task.md b/_doc/Task.md index 9a648961..4ac085d1 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,15 +1,17 @@ ## 1.3.4 -- MiniApp添加用户协议/隐私协议等(富文本) -- 小程序工单功能 -- 小程序日报功能 -- 小程序用户反馈功能 -- x 敏感字功能 -- 通用导入文件功能 +- 通用导入组件 + - 支持自定义模板下载 - 模板管理 -- 用户批量重置密码 -- 代码生成模板添加批量操作相关 + - 支持自定义上传到的地址 + - 导入数据支持选择: 跳过, 覆盖, 报错 +- x 小程序用户反馈功能 +- x 敏感字功能 +- x 用户批量重置密码 +- x 代码生成模板添加批量操作相关 - 字典翻译 ## 1.3.x +- 小程序工单功能 +- 小程序日报功能 - PostgreSQL 数据库适配 - 添加短信模板功能, 可以与各短信商渠道进行同步 - 优化异常类,将各种异常类进行拆分出来 diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 742c33a9..807cc063 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -7,9 +7,6 @@ bootx-platform-parent 1.3.3 - - service-miniapp - 4.0.0 @@ -17,29 +14,24 @@ pom 业务服务父pom + + service-baseapi + service-iam + service-notice + + - + noDeploy - service-baseapi - service-iam - service-notice service-visualization + service-miniapp true - - - deploy - - service-baseapi - service-iam - service-notice - - diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java index 227513d3..53250294 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/controller/UserAdminController.java @@ -83,6 +83,15 @@ public class UserAdminController { return Res.ok(); } + @Operation(summary = "批量重置密码") + @OperateLog(title = "批量重置密码", businessType = OperateLog.BusinessType.UPDATE, saveParam = true) + @PostMapping("/restartPasswordBatch") + public ResResult restartPasswordBatch(@NotEmpty(message = "用户不可为空") @RequestBody List userIds, + @NotBlank(message = "新密码不能为空") String newPassword) { + userAdminService.restartPasswordBatch(userIds, newPassword); + return Res.ok(); + } + @OperateLog(title = "锁定用户", businessType = OperateLog.BusinessType.UPDATE, saveParam = true) @Operation(summary = "锁定用户") @PostMapping("/lock") diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java new file mode 100644 index 00000000..1b7946af --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java @@ -0,0 +1,74 @@ +package cn.bootx.platform.miniapp.controller; + +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.Res; +import cn.bootx.platform.common.core.rest.ResResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.miniapp.core.feedback.service.FeedbackInfoService; +import cn.bootx.platform.miniapp.dto.feedback.FeedbackInfoDto; +import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Tag(name ="用户反馈信息") +@RestController +@RequestMapping("/feedback") +@RequiredArgsConstructor +public class FeedbackInfoController { + private final FeedbackInfoService feedbackInfoService; + + @Operation( summary = "添加") + @PostMapping(value = "/add") + public ResResult add(@RequestBody FeedbackInfoParam param){ + feedbackInfoService.add(param); + return Res.ok(); + } + + @Operation( summary = "修改") + @PostMapping(value = "/update") + public ResResult update(@RequestBody FeedbackInfoParam param){ + feedbackInfoService.update(param); + return Res.ok(); + } + + @Operation( summary = "删除") + @DeleteMapping(value = "/delete") + public ResResult delete(Long id){ + feedbackInfoService.delete(id); + return Res.ok(); + } + + @Operation(summary = "批量删除") + @DeleteMapping("/deleteBatch") + public ResResult deleteBatch(@RequestBody List ids) { + feedbackInfoService.deleteBatch(ids); + return Res.ok(); + } + + @Operation( summary = "通过ID查询") + @GetMapping(value = "/findById") + public ResResult findById(Long id){ + return Res.ok(feedbackInfoService.findById(id)); + } + + @Operation( summary = "查询所有") + @GetMapping(value = "/findAll") + public ResResult> findAll(){ + return Res.ok(feedbackInfoService.findAll()); + } + + @Operation( summary = "分页查询") + @GetMapping(value = "/page") + public ResResult> page(PageParam pageParam, FeedbackInfoParam query){ + return Res.ok(feedbackInfoService.page(pageParam,query)); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/convert/FeedbackInfoConvert.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/convert/FeedbackInfoConvert.java new file mode 100644 index 00000000..8281bfad --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/convert/FeedbackInfoConvert.java @@ -0,0 +1,22 @@ +package cn.bootx.platform.miniapp.core.feedback.convert; + +import cn.bootx.platform.miniapp.core.feedback.entity.FeedbackInfo; +import cn.bootx.platform.miniapp.dto.feedback.FeedbackInfoDto; +import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Mapper +public interface FeedbackInfoConvert { + FeedbackInfoConvert CONVERT = Mappers.getMapper(FeedbackInfoConvert.class); + + FeedbackInfo convert(FeedbackInfoParam in); + + FeedbackInfoDto convert(FeedbackInfo in); + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoManager.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoManager.java new file mode 100644 index 00000000..1dcbd8b6 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoManager.java @@ -0,0 +1,33 @@ +package cn.bootx.platform.miniapp.core.feedback.dao; + +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.common.query.generator.QueryGenerator; +import cn.bootx.platform.miniapp.core.feedback.entity.FeedbackInfo; +import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Repository +@RequiredArgsConstructor +public class FeedbackInfoManager extends BaseManager { + + /** + * 分页 + */ + public Page page(PageParam pageParam, FeedbackInfoParam param) { + Page mpPage = MpUtil.getMpPage(pageParam, FeedbackInfo.class); + QueryWrapper wrapper = QueryGenerator.generator(param, this.getEntityClass()); + wrapper.select(this.getEntityClass(),MpUtil::excludeBigField) + .orderByDesc(MpUtil.getColumnName(FeedbackInfo::getId)); + return this.page(mpPage,wrapper); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoMapper.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoMapper.java new file mode 100644 index 00000000..17534f6c --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/dao/FeedbackInfoMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.miniapp.core.feedback.dao; + +import cn.bootx.platform.miniapp.core.feedback.entity.FeedbackInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Mapper +public interface FeedbackInfoMapper extends BaseMapper { +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java new file mode 100644 index 00000000..1c75039c --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java @@ -0,0 +1,63 @@ +package cn.bootx.platform.miniapp.core.feedback.entity; + +import cn.bootx.mybatis.table.modify.annotation.DbComment; +import cn.bootx.mybatis.table.modify.annotation.DbTable; +import cn.bootx.platform.common.core.function.EntityBaseFunction; +import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.miniapp.core.feedback.convert.FeedbackInfoConvert; +import cn.bootx.platform.miniapp.dto.feedback.FeedbackInfoDto; +import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023/8/15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@DbTable(comment = "用户反馈信息") +@TableName("miniapp_feedback_info") +public class FeedbackInfo extends MpBaseEntity implements EntityBaseFunction { + + /** 问题分类 */ + @DbComment("问题分类") + private String classify; + + /** 时间 */ + @DbComment("时间") + private LocalDateTime time; + + /** 联系方式 */ + @DbComment("联系方式") + private String contact; + + /** 姓名 */ + @DbComment("姓名") + private String name; + + /** 反馈用户ID */ + @DbComment("反馈用户ID") + private Long userId; + + /** 内容 */ + @DbComment("内容") + private String content; + + /** 创建对象 */ + public static FeedbackInfo init(FeedbackInfoParam in) { + return FeedbackInfoConvert.CONVERT.convert(in); + } + + /** 转换成dto */ + @Override + public FeedbackInfoDto toDto() { + return FeedbackInfoConvert.CONVERT.convert(this); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/service/FeedbackInfoService.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/service/FeedbackInfoService.java new file mode 100644 index 00000000..d1e66533 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/service/FeedbackInfoService.java @@ -0,0 +1,84 @@ +package cn.bootx.platform.miniapp.core.feedback.service; + +import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.rest.PageResult; +import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.common.core.util.ResultConvertUtil; +import cn.bootx.platform.common.mybatisplus.util.MpUtil; +import cn.bootx.platform.miniapp.core.feedback.dao.FeedbackInfoManager; +import cn.bootx.platform.miniapp.core.feedback.entity.FeedbackInfo; +import cn.bootx.platform.miniapp.dto.feedback.FeedbackInfoDto; +import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class FeedbackInfoService { + private final FeedbackInfoManager feedbackInfoManager; + + /** + * 添加 + */ + public void add(FeedbackInfoParam param){ + FeedbackInfo feedbackInfo = FeedbackInfo.init(param); + feedbackInfoManager.save(feedbackInfo); + } + + /** + * 修改 + */ + public void update(FeedbackInfoParam param){ + FeedbackInfo feedbackInfo = feedbackInfoManager.findById(param.getId()).orElseThrow(DataNotExistException::new); + + BeanUtil.copyProperties(param,feedbackInfo, CopyOptions.create().ignoreNullValue()); + feedbackInfoManager.updateById(feedbackInfo); + } + + /** + * 分页 + */ + public PageResult page(PageParam pageParam,FeedbackInfoParam query){ + return MpUtil.convert2DtoPageResult(feedbackInfoManager.page(pageParam,query)); + } + + /** + * 获取单条 + */ + public FeedbackInfoDto findById(Long id){ + return feedbackInfoManager.findById(id).map(FeedbackInfo::toDto).orElseThrow(DataNotExistException::new); + } + + /** + * 获取全部 + */ + public List findAll(){ + return ResultConvertUtil.dtoListConvert(feedbackInfoManager.findAll()); + } + + /** + * 删除 + */ + public void delete(Long id){ + feedbackInfoManager.deleteById(id); + } + + + /** + * 批量删除 + */ + public void deleteBatch(List ids){ + feedbackInfoManager.deleteByIds(ids); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/feedback/FeedbackInfoDto.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/feedback/FeedbackInfoDto.java new file mode 100644 index 00000000..5c673535 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/dto/feedback/FeedbackInfoDto.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.miniapp.dto.feedback; + +import cn.bootx.platform.common.core.rest.dto.BaseDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Schema(title = "用户反馈信息") +@Accessors(chain = true) +public class FeedbackInfoDto extends BaseDto { + + @Schema(description = "问题分类") + private String classify; + @Schema(description = "时间") + private LocalDateTime time; + @Schema(description = "联系方式") + private String contact; + @Schema(description = "姓名") + private String name; + @Schema(description = "反馈用户ID") + private Long userId; + @Schema(description = "内容") + private String content; + +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java new file mode 100644 index 00000000..ac29bb65 --- /dev/null +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java @@ -0,0 +1,35 @@ +package cn.bootx.platform.miniapp.param.feedback; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 用户反馈信息 + * @author xxm + * @since 2023-08-15 + */ +@Data +@Schema(title = "用户反馈信息") +@Accessors(chain = true) +public class FeedbackInfoParam { + + @Schema(description= "主键") + private Long id; + + @Schema(description = "问题分类") + private String classify; + @Schema(description = "时间") + private LocalDateTime time; + @Schema(description = "联系方式") + private String contact; + @Schema(description = "姓名") + private String name; + @Schema(description = "反馈用户ID") + private Long userId; + @Schema(description = "内容") + private String content; + +} diff --git a/pom.xml b/pom.xml index 2707c6ac..ab4d2626 100644 --- a/pom.xml +++ b/pom.xml @@ -47,16 +47,18 @@ https://gitee.com/bootx/bootx-platform + + bootx-common-core + bootx-common-starters + bootx-commons + bootx-services + noDeploy - bootx-common-core - bootx-common-starters - bootx-commons - bootx-services bootx-start bootx-demo @@ -64,16 +66,6 @@ true - - - deploy - - bootx-common-core - bootx-common-starters - bootx-commons - bootx-services - - -- Gitee From 8fe8c5f9471fcbc877833f74d93d0fbb35a141ff Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Wed, 16 Aug 2023 17:28:36 +0800 Subject: [PATCH 23/35] =?UTF-8?q?doc=20=E6=B3=A8=E9=87=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/core/annotation/PermCode.java | 5 +++-- bootx-commons/common-jackson/README.md | 10 ---------- .../mybatisplus/handler/JacksonRawTypeHandler.java | 3 ++- 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 bootx-commons/common-jackson/README.md diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java index ac9d1027..9df640d1 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/PermCode.java @@ -3,8 +3,9 @@ package cn.bootx.platform.common.core.annotation; import java.lang.annotation.*; /** - * 权限码鉴权注解 1. 用在Controller及对应的请求方法上时，可以通过用户是否拥有该请求路径的权限码，来决定是否可以通行本次请求 2. - * 放在数据库实体类及字段上时，会在启用查询字段权限的时候，对用户没有权限码的字段不进行SQL查询 + * 权限码鉴权注解 + * 1. 用在Controller及对应的请求方法上时，可以通过用户是否拥有该请求路径的权限码，来决定是否可以通行本次请求 + * 2.放在数据库实体类及字段上时，会在启用查询字段权限的时候，对用户没有权限码的字段不进行SQL查询 * * @author xxm * @since 2023/1/22 diff --git a/bootx-commons/common-jackson/README.md b/bootx-commons/common-jackson/README.md deleted file mode 100644 index fbdc98b3..00000000 --- a/bootx-commons/common-jackson/README.md +++ /dev/null @@ -1,10 +0,0 @@ - -## JackSon配置 - -### 功能 - -- 提供`JacksonUtil`工具类，用于需要进行`Jackson`解析的场合 -- 提供 `java8` 时间序列化类，在`Jackson`序列化时对`JDK8`新增的时间类进行支持 -- 提供`Long` 类型序列化为`String`类型的序列化类，处理前端长整形精度丢失问题 -- 提供一个默认的`ObjectMapper`序列化配置，支持`jdk8`，`LongToString`等配置 -- 提供`Jackson2ObjectMapper`相关配置（`Spring MVC`进行参数和结果转换），支持`jdk8`，`LongToString`等配置 diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java index 053c2394..dc01d7d3 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java @@ -9,7 +9,8 @@ import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; /** - * Jackson 实现 JSON 字段类型处理器, 会记录对象属性类型, 通常用于被容器(List、Set、Map)包装的属性上 + * Jackson 实现 JSON 字段类型处理器, 会记录对象属性类型, 通常用于储存不确定对象的属性上 + * 例如: 泛型对象、存储的数据是字段类型的子类等 * * @author xxm * @since 2022/7/11 -- Gitee From 07f84c8694217bca50dae1e6a999a45aa388e7dc Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Fri, 18 Aug 2023 17:13:43 +0800 Subject: [PATCH 24/35] =?UTF-8?q?feat=20=E4=B8=80=E4=BA=9B=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE=E7=9A=84=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/annotation/IgnoreAuth.java | 1 + .../common/core/function/ParamService.java | 2 +- .../codegen/template/java/param.java.vm | 2 + .../mybatisplus/base/MpCreateEntity.java | 1 + .../handler/JacksonRawTypeHandler.java | 7 +++ .../query/service/SuperQueryDemoService.java | 2 + bootx-services/pom.xml | 1 + .../core/captcha/service/CaptchaService.java | 3 - .../parameter/service/SystemParamService.java | 7 ++- bootx-services/service-iam/pom.xml | 6 ++ .../core/auth/login/PasswordLoginHandler.java | 6 +- .../core/auth/service/AuthAssistService.java | 20 ++++++- .../GetAuthClientServiceImpl.java | 2 +- .../GetAuthLoginTypeServiceImpl.java | 2 +- .../iam/core/client/entity/LonginType.java | 5 +- .../login/entity/LoginSecurityConfig.java | 59 +++++++++++++++++++ .../password/entity/PasswordHistory.java | 30 ++++++++++ .../entity/PasswordLoginFailRecord.java | 32 ++++++++++ .../entity/PasswordSecurityConfig.java | 38 ++++++++++++ .../platform/PlatformSecurityConfig.java | 29 +++++++++ .../platform/iam/dto/auth/AuthInfoResult.java | 48 --------------- .../iam/dto/auth/AuthPasswordDto.java | 33 ----------- .../iam/dto/auth/LoginContentResult.java | 29 +++++++++ .../iam/param/auth/LoginContentParam.java | 23 ++++++++ bootx-services/service-platform/pom.xml | 42 +++++++++++++ 25 files changed, 333 insertions(+), 97 deletions(-) rename bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/{handler => service}/GetAuthClientServiceImpl.java (95%) rename bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/{handler => service}/GetAuthLoginTypeServiceImpl.java (95%) create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordHistory.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordLoginFailRecord.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordSecurityConfig.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/platform/PlatformSecurityConfig.java delete mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthInfoResult.java delete mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/AuthPasswordDto.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/auth/LoginContentResult.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/auth/LoginContentParam.java create mode 100644 bootx-services/service-platform/pom.xml diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java index f47b1c74..604e6003 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/annotation/IgnoreAuth.java @@ -23,4 +23,5 @@ public @interface IgnoreAuth { */ boolean login() default false; + } diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java index b72ea2c9..c88e1236 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/ParamService.java @@ -9,7 +9,7 @@ package cn.bootx.platform.common.core.function; public interface ParamService { /** - * 获取 参数值 + * 获取 参数值, 如果未启用, 返回空 */ String getValue(String key); diff --git a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm index ddae2982..6a294adf 100644 --- a/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm +++ b/bootx-common-starters/common-starter-code-gen/src/main/resources/codegen/template/java/param.java.vm @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.LocalDate; +import cn.bootx.platform.common.core.annotation.QueryParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ import lombok.experimental.Accessors; * @author ${author} * @since ${datetime} */ +@QueryParam(type = QueryParam.CompareTypeEnum.LIKE) @Data @Schema(title = "${comments}") @Accessors(chain = true) diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java index ba0a8f01..fa9a8935 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/base/MpCreateEntity.java @@ -10,6 +10,7 @@ import lombok.experimental.FieldNameConstants; import java.time.LocalDateTime; /** + * 创建实体类 (不带逻辑删除) * @author xxm * @since 2022/7/26 */ diff --git a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java index dc01d7d3..68a0fe5a 100644 --- a/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java +++ b/bootx-commons/common-mybatis-plus/src/main/java/cn/bootx/platform/common/mybatisplus/handler/JacksonRawTypeHandler.java @@ -22,6 +22,9 @@ public class JacksonRawTypeHandler extends AbstractJsonTypeHandler { private final Class type; + /** + * @param type 对象类型 + */ public JacksonRawTypeHandler(Class type) { if (log.isTraceEnabled()) { log.trace("JacksonRawTypeHandler(" + type + ")"); @@ -35,6 +38,10 @@ public class JacksonRawTypeHandler extends AbstractJsonTypeHandler { return JacksonUtil.toTypeBean(json, type); } + /** + * + * @param obj + */ @Override protected String toJson(Object obj) { return JacksonUtil.toTypeJson(obj); diff --git a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java index 1c36a3f3..d3f9d306 100644 --- a/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java +++ b/bootx-demo/src/main/java/cn/bootx/platform/demo/core/query/service/SuperQueryDemoService.java @@ -1,5 +1,6 @@ package cn.bootx.platform.demo.core.query.service; +import cn.bootx.platform.common.core.annotation.QueryParam; import cn.bootx.platform.common.core.exception.DataNotExistException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; @@ -21,6 +22,7 @@ import java.time.LocalDateTime; * @author xxm * @since 2022/2/21 */ +@QueryParam(type = QueryParam.CompareTypeEnum.LIKE) @Slf4j @Service @RequiredArgsConstructor diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 807cc063..2ed39715 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -18,6 +18,7 @@ service-baseapi service-iam service-notice + service-platform diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java index 148826dd..0cbd05de 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java @@ -2,7 +2,6 @@ package cn.bootx.platform.baseapi.core.captcha.service; import cn.bootx.platform.baseapi.dto.captcha.CaptchaDataResult; import cn.bootx.platform.common.redis.RedisClient; -import cn.bootx.platform.common.websocket.service.UserWsNoticeService; import cn.hutool.core.util.RandomUtil; import com.wf.captcha.ArithmeticCaptcha; import lombok.RequiredArgsConstructor; @@ -31,8 +30,6 @@ public class CaptchaService { /** 邮箱验证码前缀 */ private final String emailCaptchaPrefix = "email:captcha:"; - private final UserWsNoticeService userWsNoticeService; - private final RedisClient redisClient; /** diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java index fa75fe8c..8ba49202 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/parameter/service/SystemParamService.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Objects; +import java.util.Optional; /** * 系统参数 @@ -117,7 +118,11 @@ public class SystemParamService implements ParamService { */ @Override public String getValue(String key) { - return systemParamManager.findByParamKey(key).map(SystemParameter::getValue).orElse(null); + Optional opt = systemParamManager.findByParamKey(key); + if (opt.isPresent()&&Objects.equals(opt.get().getEnable(), true)) { + return opt.map(SystemParameter::getValue).orElse(null); + } + return null; } } diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 0a92ea4c..2b4c760c 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -38,6 +38,12 @@ service-baseapi ${bootx-platform.version} + + + cn.bootx.platform + service-platform + ${bootx-platform.version} + cn.bootx.platform diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java index 83cd5d89..45a00ae6 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/PasswordLoginHandler.java @@ -1,10 +1,13 @@ package cn.bootx.platform.iam.core.auth.login; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.core.entity.UserDetail; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.util.RegexUtil; +import cn.bootx.platform.iam.code.UserStatusCode; import cn.bootx.platform.iam.core.user.service.UserAdminService; import cn.bootx.platform.iam.core.user.service.UserQueryService; +import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.bootx.platform.starter.auth.authentication.UsernamePasswordAuthentication; import cn.bootx.platform.starter.auth.entity.AuthInfoResult; import cn.bootx.platform.starter.auth.entity.AuthLoginType; @@ -12,9 +15,6 @@ import cn.bootx.platform.starter.auth.entity.LoginAuthContext; import cn.bootx.platform.starter.auth.exception.LoginFailureException; import cn.bootx.platform.starter.auth.exception.UserNotFoundException; import cn.bootx.platform.starter.auth.util.PasswordEncoder; -import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.platform.iam.code.UserStatusCode; -import cn.bootx.platform.iam.dto.user.UserInfoDto; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java index abbbc951..43645283 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/AuthAssistService.java @@ -1,11 +1,13 @@ package cn.bootx.platform.iam.core.auth.service; +import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; import cn.bootx.platform.common.core.exception.BizException; +import cn.bootx.platform.iam.code.UserStatusCode; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.iam.dto.auth.LoginContentResult; import cn.bootx.platform.iam.exception.user.UserInfoNotExistsException; -import cn.bootx.platform.baseapi.core.captcha.service.CaptchaService; -import cn.bootx.platform.iam.code.UserStatusCode; +import cn.bootx.platform.iam.param.auth.LoginContentParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -41,4 +43,18 @@ public class AuthAssistService { captchaService.sendSmsCaptcha(phone, 5 * 60, smsCaptchaType); } + /** + * 登录⻚上下⽂信息 + */ + public LoginContentResult getLoginContent(LoginContentParam param){ + return null; + } + + /** + * 二次校验信息 + */ + public void getSecondCheck(){ + + } + } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthClientServiceImpl.java similarity index 95% rename from bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthClientServiceImpl.java index 0cb474d8..31fda772 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthClientServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthClientServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.iam.core.auth.handler; +package cn.bootx.platform.iam.core.auth.service; import cn.bootx.platform.iam.core.client.dao.ClientManager; import cn.bootx.platform.iam.core.client.entity.Client; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthLoginTypeServiceImpl.java similarity index 95% rename from bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java rename to bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthLoginTypeServiceImpl.java index a8f59643..07b581f2 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/handler/GetAuthLoginTypeServiceImpl.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/service/GetAuthLoginTypeServiceImpl.java @@ -1,4 +1,4 @@ -package cn.bootx.platform.iam.core.auth.handler; +package cn.bootx.platform.iam.core.auth.service; import cn.bootx.platform.iam.core.client.dao.LoginTypeManager; import cn.bootx.platform.iam.core.client.entity.LonginType; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java index fefb4fe2..f7d76f2f 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/LonginType.java @@ -37,16 +37,13 @@ public class LonginType extends MpBaseEntity implements EntityBaseFunction loginTypes; + + @Schema(description = "是否启用验证码") + private boolean enableCaptcha; + + @Schema(description = "密码是否加密传输") + private boolean passwordEncrypted; + +} diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/auth/LoginContentParam.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/auth/LoginContentParam.java new file mode 100644 index 00000000..7f3c9670 --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/param/auth/LoginContentParam.java @@ -0,0 +1,23 @@ +package cn.bootx.platform.iam.param.auth; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 前端登录页信息 + * @author xxm + * @since 2023/8/17 + */ +@Data +@Accessors(chain = true) +@Schema(title = "登录页信息") +public class LoginContentParam { + + @Schema(description = "终端Code") + private String clientId; + + @Schema(description = "账号") + private String username; + +} diff --git a/bootx-services/service-platform/pom.xml b/bootx-services/service-platform/pom.xml new file mode 100644 index 00000000..f588cc7a --- /dev/null +++ b/bootx-services/service-platform/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + cn.bootx.platform + bootx-services + 1.3.3 + + + service-platform + jar + + + + + com.mysql + mysql-connector-j + runtime + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + cn.bootx.platform + service-baseapi + ${bootx-platform.version} + + + + cn.bootx.platform + common-starter-audit-log + + + + -- Gitee From 4afb56994fa8c5d86c740856f1a1aeee5713c8a5 Mon Sep 17 00:00:00 2001 From: xucun Date: Fri, 18 Aug 2023 23:11:53 +0800 Subject: [PATCH 25/35] =?UTF-8?q?:sparkles:=E9=80=82=E9=85=8D=E8=85=BE?= =?UTF-8?q?=E8=AE=AF=E4=BA=91cos=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/ip2region/IpToRegionService.java | 9 +- .../starter/auth/code/AuthLoginTypeCode.java | 4 + .../common-starter-file/pom.xml | 10 + .../starter/file/code/FileUploadTypeEnum.java | 5 +- .../configuration/FileUploadProperties.java | 69 +++++-- .../file/controller/FIleUpLoadController.java | 9 +- .../starter/file/dto/TempCredential.java | 19 ++ .../file/service/FileUploadService.java | 12 ++ .../service/impl/TencentOssUploadService.java | 187 ++++++++++++++++++ .../common-starter-wechat/pom.xml | 20 ++ .../configuration/WeChatAppletProperties.java | 26 +++ .../configuration/WeChatConfiguration.java | 20 +- .../auth/login/WeChatAppletLoginHandler.java | 118 +++++++++++ .../controller/FeedbackInfoController.java | 9 +- .../param/feedback/FeedbackInfoParam.java | 2 + 15 files changed, 501 insertions(+), 18 deletions(-) create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java create mode 100644 bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java create mode 100644 bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatAppletProperties.java create mode 100644 bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java diff --git a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java index e0543799..4cb65b7b 100644 --- a/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java +++ b/bootx-common-starters/common-starter-audit-log/src/main/java/cn/bootx/platform/starter/audit/log/ip2region/IpToRegionService.java @@ -79,8 +79,15 @@ public class IpToRegionService { public IpRegion getRegionByIp(String ip){ // 判断IP是否合法 Matcher matcher = PatternPool.IPV4.matcher(ip); + Matcher ipV6Matcher =PatternPool.IPV6.matcher(ip); if (!matcher.matches()) { - log.warn("非法IPv4地址: {}",ip); + if (ipV6Matcher.matches()){ + log.warn("IpV6地址: {}",ip); + + }else { + log.warn("非法IPv4地址: {}",ip); + + } return null; } diff --git a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java index 2fa7aec9..328693bc 100644 --- a/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java +++ b/bootx-common-starters/common-starter-auth/src/main/java/cn/bootx/platform/starter/auth/code/AuthLoginTypeCode.java @@ -33,6 +33,10 @@ public interface AuthLoginTypeCode { /** 微信登录(公众号) */ String WE_CHAT = "weChat"; + + /** 微信登录(小程序) */ + String WE_CHAT_APPLET = "weChatApplet"; + /** 微信登录(开放平台) */ String WE_CHAT_OPEN = "weChatOpen"; diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index 389749e8..a8dd4aec 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -42,5 +42,15 @@ ${minio.version} true + + com.qcloud + cos_api + 5.6.155 + + + com.qcloud + cos-sts_api + 3.1.0 + diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java index 113361c5..f2bebea4 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/code/FileUploadTypeEnum.java @@ -17,6 +17,9 @@ public enum FileUploadTypeEnum { /** minio存储 */ MINIO, /** 阿里云 oss存储 */ - ALIYUN_OSS + ALIYUN_OSS, + + /** 腾讯云 oss存储 */ + TENCENT_OSS } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index 7e24f626..96b9c633 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -23,21 +23,33 @@ public class FileUploadProperties { */ private FileUploadTypeEnum uploadType = FileUploadTypeEnum.LOCAL; - /** 服务器地址,优先级低于系统参数配置 */ + /** + * 服务器地址,优先级低于系统参数配置 + */ private String serverUrl = "http://127.0.0.1:9999"; - /** 本地存储 */ + /** + * 本地存储 + */ private Local local = new Local(); - /** 数据库存储 */ + /** + * 数据库存储 + */ private JDBC jdbc = new JDBC(); - /** mongo存储配置 */ + /** + * mongo存储配置 + */ private Mongo mongo = new Mongo(); - /** minio存储配置 */ + /** + * minio存储配置 + */ private Minio minio = new Minio(); + private TencentOss tencentOss=new TencentOss(); + /** * 本地存储 */ @@ -45,7 +57,9 @@ public class FileUploadProperties { @Setter public static class Local { - /** 本地存储路径 */ + /** + * 本地存储路径 + */ private String localPath = "/data/file/"; } @@ -57,7 +71,9 @@ public class FileUploadProperties { @Setter public static class JDBC { - /** 是否以Base64方式进行存储 */ + /** + * 是否以Base64方式进行存储 + */ private boolean base64 = false; } @@ -69,7 +85,9 @@ public class FileUploadProperties { @Setter public static class Mongo { - /** 存储桶 */ + /** + * 存储桶 + */ private String bucket = "fs"; } @@ -81,21 +99,46 @@ public class FileUploadProperties { @Setter public static class Minio { - /** 端点地址 */ + /** + * 端点地址 + */ private String endpoint; - /** 区域 */ + /** + * 区域 + */ private String region; - /** 访问 key */ + /** + * 访问 key + */ private String accessKey; - /** 访问 Secret */ + /** + * 访问 Secret + */ private String accessSecret; - /** 存储桶 需要至少三位 */ + /** + * 存储桶 需要至少三位 + */ private String bucket = "bootx"; } + @Getter + @Setter + public static class TencentOss { + + private String region; + + private String secretId; + + private String secretKey; + + private String sessionToken; + + private String bucket; + } + } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index 65c9ea25..828f8830 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -5,6 +5,7 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; +import cn.bootx.platform.starter.file.dto.TempCredential; import cn.bootx.platform.starter.file.dto.UpdateFileDto; import cn.bootx.platform.starter.file.service.FileUploadService; import io.swagger.v3.oas.annotations.Operation; @@ -48,7 +49,7 @@ public class FIleUpLoadController { @Operation(summary = "删除") @DeleteMapping("/delete") - public ResResult delete(Long id){ + public ResResult delete(Long id) { uploadService.delete(id); return Res.ok(); } @@ -83,4 +84,10 @@ public class FIleUpLoadController { return uploadService.download(id); } + @Operation(summary = "获取临时oss密钥") + @GetMapping("/getTempCredentials") + public ResResult getTempCredentials() { + return Res.ok(uploadService.getTempCredentials()); + } + } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java new file mode 100644 index 00000000..33b7c686 --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java @@ -0,0 +1,19 @@ +package cn.bootx.platform.starter.file.dto; + +import lombok.Data; + +import java.util.TreeMap; + +@Data +public class TempCredential { + private String tmpSecretId; + private String tmpSecretKey; + private String sessionToken; + + private Long expiredTime; + + private TreeMap formData; + + private String uploadUrl; + +} diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 8e5c4cd8..0d23ee54 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -1,5 +1,6 @@ package cn.bootx.platform.starter.file.service; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; import cn.bootx.platform.starter.file.configuration.FileUploadProperties; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.function.ParamService; @@ -7,9 +8,12 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.starter.file.dao.UpdateFileManager; +import cn.bootx.platform.starter.file.dto.TempCredential; import cn.bootx.platform.starter.file.dto.UpdateFileDto; import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.impl.OssUploadService; +import cn.bootx.platform.starter.file.service.impl.TencentOssUploadService; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; @@ -187,4 +191,12 @@ public class FileUploadService { return serverUrl; } + public TempCredential getTempCredentials() { + + TencentOssUploadService ossUploadService=(TencentOssUploadService)uploadServices.stream().filter(s -> s.enable(FileUploadTypeEnum.TENCENT_OSS)) + .findFirst().orElseThrow(() -> new BizException("未找到该类文件的处理器")); + + return ossUploadService.getTemplateCredential(); + + } } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java new file mode 100644 index 00000000..7355df85 --- /dev/null +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java @@ -0,0 +1,187 @@ +package cn.bootx.platform.starter.file.service.impl; + +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; +import cn.bootx.platform.starter.file.configuration.FileUploadProperties; +import cn.bootx.platform.starter.file.dto.TempCredential; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; +import cn.bootx.platform.starter.file.entity.UploadFileContext; +import cn.bootx.platform.starter.file.service.UploadService; +import cn.hutool.core.codec.Base64Encoder; +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.date.SystemClock; +import cn.hutool.crypto.SecureUtil; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.POJONode; +import com.qcloud.cos.COSClient; +import com.qcloud.cos.ClientConfig; +import com.qcloud.cos.auth.BasicCOSCredentials; +import com.qcloud.cos.auth.COSCredentials; +import com.qcloud.cos.http.HttpProtocol; +import com.qcloud.cos.region.Region; +import com.tencent.cloud.CosStsClient; +import com.tencent.cloud.Response; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.joda.time.DateTime; +import org.joda.time.DateTimeUtils; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoField; +import java.time.temporal.ChronoUnit; +import java.util.Base64; +import java.util.Objects; +import java.util.TreeMap; + +import static java.time.temporal.ChronoUnit.MINUTES; + +/** + * 阿里云OSS上传文件 + * + * @author xxm + * @since 2022/1/12 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class TencentOssUploadService implements UploadService { + private final FileUploadProperties fileUploadProperties; + + private final ObjectMapper objectMapper; + + COSClient client; + + @Override + public boolean enable(FileUploadTypeEnum type) { + boolean initFlag = type == FileUploadTypeEnum.TENCENT_OSS; + if (initFlag) { + this.doInit(); + } + return initFlag; + } + + @Override + public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { + return null; + } + + @Override + public void preview(UpdateFileInfo updateFileInfo, HttpServletResponse response) { + + } + + @Override + public InputStream download(UpdateFileInfo updateFileInfo) { + return null; + } + + @Override + public void delete(UpdateFileInfo updateFileInfo) { + + } + + public TempCredential getTemplateCredential() { + TempCredential tempCredential; + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + + TreeMap config = new TreeMap(); + config.put("secretId", oss.getSecretId()); + config.put("secretKey", oss.getSecretKey()); + config.put("durationSeconds", 1800); + config.put("bucket", oss.getBucket()); + config.put("region", oss.getRegion()); + config.put("allowPrefixes", new String[]{ + "bootx/*" + }); + + String[] allowActions = new String[]{ + // 简单上传 + "name/cos:PutObject", + // 表单上传、小程序上传 + "name/cos:PostObject", + // 分块上传 + "name/cos:InitiateMultipartUpload", + "name/cos:ListMultipartUploads", + "name/cos:ListParts", + "name/cos:UploadPart", + "name/cos:CompleteMultipartUpload" + }; + config.put("allowActions", allowActions); + try { + Response response = CosStsClient.getCredential(config); + tempCredential = new TempCredential(); + tempCredential.setSessionToken(response.credentials.sessionToken); + tempCredential.setTmpSecretKey(response.credentials.tmpSecretKey); + tempCredential.setTmpSecretId(response.credentials.tmpSecretId); + tempCredential.setExpiredTime(1800L); + } catch (IOException e) { + throw new RuntimeException(e); + } + + LocalDateTime startTime = LocalDateTime.now(); + + LocalDateTime endTime = startTime.plus(5, MINUTES); + String keyTime = LocalDateTimeUtil.toEpochMilli(startTime) / 1000 + ":" + LocalDateTimeUtil.toEpochMilli(endTime) / 1000; + TreeMap formData = new TreeMap<>(); + ObjectNode root = objectMapper.createObjectNode(); + + root.put("expiration", endTime.plus(30, MINUTES).atZone(ZoneId.systemDefault()) + .withZoneSameInstant(ZoneId.of("Z")).withNano(0).toString()); + // root.put("expiration", endTime.plus(30, MINUTES).withNano(0).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); + ArrayNode conditions = objectMapper.createArrayNode(); + root.putIfAbsent("conditions", conditions); + ObjectNode child = objectMapper.createObjectNode(); + child.put("bucket", oss.getBucket()); + conditions.addPOJO(child); + child = objectMapper.createObjectNode(); + child.put("q-sign-algorithm", "sha1"); + conditions.addPOJO(child); + child = objectMapper.createObjectNode(); + child.put("q-ak", tempCredential.getTmpSecretId()); + + conditions.addPOJO(child); + child = objectMapper.createObjectNode(); + child.put("q-sign-time", keyTime); + conditions.addPOJO(child); + formData.put("x-cos-security-token", tempCredential.getSessionToken()); + + formData.put("policy", Base64Encoder.encode(JacksonUtil.toJson(root))); + formData.put("q-sign-algorithm", "sha1"); + + formData.put("q-ak", tempCredential.getTmpSecretId()); + + formData.put("q-key-time", keyTime); + + String signKey = SecureUtil.hmacSha1(tempCredential.getTmpSecretKey()).digestHex(keyTime); + String stringToSign = SecureUtil.sha1(signKey); + String signature = SecureUtil.hmacSha1(signKey).digestHex(stringToSign); + formData.put("q-signature", signature); + + tempCredential.setFormData(formData); + tempCredential.setUploadUrl("https://" + oss.getBucket() + ".cos.ap-beijing.myqcloud.com"); + return tempCredential; + } + + protected void doInit() { + if (Objects.nonNull(client)) { + return; + } + // 初始化客户端 + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + + Region region = new Region(oss.getRegion()); //COS_REGION 参数：配置成存储桶 bucket 的实际地域，例如 ap-beijing，更多 COS 地域的简称请参见 https://cloud.tencent.com/document/product/436/6224 + ClientConfig clientConfig = new ClientConfig(region); + clientConfig.setHttpProtocol(HttpProtocol.https); + COSCredentials cred = new BasicCOSCredentials(oss.getSecretId(), oss.getSecretKey()); + client = new COSClient(cred, clientConfig); + } +} diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml index 581c7f41..7ecc8b14 100644 --- a/bootx-common-starters/common-starter-wechat/pom.xml +++ b/bootx-common-starters/common-starter-wechat/pom.xml @@ -43,6 +43,26 @@ + + + com.github.binarywang + weixin-java-miniapp + ${wxjava.version} + + + commons-io + commons-io + + + guava + com.google.guava + + + com.thoughtworks.xstream + xstream + + + com.thoughtworks.xstream diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatAppletProperties.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatAppletProperties.java new file mode 100644 index 00000000..2dc48b7b --- /dev/null +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatAppletProperties.java @@ -0,0 +1,26 @@ +package cn.bootx.platform.starter.wechat.configuration; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 微信公众平台配置 + * + * @author xxm + * @since 2022/7/15 + */ +@Getter +@Setter +@ConfigurationProperties("bootx.starter.third.wechat-applet") +public class WeChatAppletProperties { + + /** AppKey */ + private String appId; + + /** AppSecret */ + private String appSecret; + + + +} diff --git a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java index 991a8f63..d1bce120 100644 --- a/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java +++ b/bootx-common-starters/common-starter-wechat/src/main/java/cn/bootx/platform/starter/wechat/configuration/WeChatConfiguration.java @@ -1,5 +1,9 @@ package cn.bootx.platform.starter.wechat.configuration; +import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; +import cn.binarywang.wx.miniapp.config.WxMaConfig; +import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.mp.api.*; import me.chanjar.weixin.mp.api.impl.*; @@ -20,6 +24,8 @@ public class WeChatConfiguration { private final WeChatProperties weChatProperties; + private final WeChatAppletProperties weChatAppletProperties; + /** * 微信公众号APIService */ @@ -42,5 +48,17 @@ public class WeChatConfiguration { config.setAesKey(weChatProperties.getEncodingAesKey()); // 消息加解密密钥 return config; } - + @Bean + public WxMaService wxMaService(WxMaConfig wxMaConfigStorage) { + WxMaService wxMpService = new WxMaServiceImpl(); + wxMpService.setWxMaConfig(wxMaConfigStorage); + return wxMpService; + } + @Bean + public WxMaConfig wxMaConfigStorage() { + WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); + config.setAppid(weChatAppletProperties.getAppId()); // 设置微信公众号的appid + config.setSecret(weChatAppletProperties.getAppSecret()); // 设置微信公众号的app corpSecret + return config; + } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java new file mode 100644 index 00000000..a3d008ec --- /dev/null +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java @@ -0,0 +1,118 @@ +package cn.bootx.platform.iam.core.auth.login; + +import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import cn.bootx.platform.common.jackson.util.JacksonUtil; +import cn.bootx.platform.iam.core.third.dao.UserThirdManager; +import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.user.dao.UserInfoManager; +import cn.bootx.platform.iam.core.user.entity.UserInfo; +import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; +import cn.bootx.platform.starter.auth.code.AuthLoginTypeCode; +import cn.bootx.platform.starter.auth.configuration.AuthProperties; +import cn.bootx.platform.starter.auth.entity.AuthInfoResult; +import cn.bootx.platform.starter.auth.entity.LoginAuthContext; +import cn.bootx.platform.starter.auth.entity.ThirdAuthCode; +import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.hutool.http.HttpUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthUser; +import org.checkerframework.checker.units.qual.A; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@Component +@RequiredArgsConstructor +public class WeChatAppletLoginHandler implements OpenIdAuthentication { + + + private final WxMaService wxMaService; + + private final UserThirdManager userThirdManager; + + private final UserInfoManager userInfoManager; + + @Override + public String getLoginType() { + return AuthLoginTypeCode.WE_CHAT_APPLET; + } + + @Override + public boolean adaptation(String loginType) { + return OpenIdAuthentication.super.adaptation(loginType); + } + + @Override + public void authenticationBefore(LoginAuthContext context) { + OpenIdAuthentication.super.authenticationBefore(context); + } + + @Override + public AuthInfoResult attemptAuthentication(LoginAuthContext context) { + + String authCode = context.getRequest().getParameter(AuthLoginTypeCode.WE_CHAT_APPLET); + + AuthUser authUser = this.getAuthUser(authCode, null); + + // 获取企微关联的用户id + UserThird userThird = userThirdManager.findByField(UserThird::getWeChatId, authUser.getUuid()) + .orElseThrow(() -> new LoginFailureException("微信没有找到绑定的用户")); + + // 获取用户信息 + UserInfo userInfo = userInfoManager.findById(userThird.getUserId()) + .orElseThrow(() -> new LoginFailureException("用户不存在")); + + return new AuthInfoResult().setUserDetail(userInfo.toUserDetail()).setId(userInfo.getId()); + } + + @Override + public void authenticationAfter(AuthInfoResult authInfoResult, LoginAuthContext context) { + OpenIdAuthentication.super.authenticationAfter(authInfoResult, context); + } + + @Override + public AuthInfoResult authentication(LoginAuthContext context) { + return OpenIdAuthentication.super.authentication(context); + } + + @Override + public String getLoginUrl() { + return OpenIdAuthentication.super.getLoginUrl(); + } + + @Override + public ThirdAuthCode getAuthCode(AuthCallback callback) { + return OpenIdAuthentication.super.getAuthCode(callback); + } + + @Override + public AuthUser getAuthUser(String authCode, String state) { + try { + WxMaJscode2SessionResult result = wxMaService.getUserService().getSessionInfo(authCode); + log.debug("微信服务器返回的用户信息:{}", JacksonUtil.toJson(result)); + return AuthUser.builder() + .avatar(null) + .uuid(result.getUnionid()). + nickname("未知") + .username("未知") + .avatar("未知") + .build(); + } catch (WxErrorException e) { + log.error("请求微信服务器异常:{}", e.getError()); + throw new RuntimeException(e); + } + + } + + @Override + public void bindUser(String authCode, String state) { + OpenIdAuthentication.super.bindUser(authCode, state); + } +} diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java index 1b7946af..ed195a6a 100644 --- a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/controller/FeedbackInfoController.java @@ -1,5 +1,6 @@ package cn.bootx.platform.miniapp.controller; +import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; @@ -10,6 +11,9 @@ import cn.bootx.platform.miniapp.param.feedback.FeedbackInfoParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.validation.BindException; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -28,7 +32,10 @@ public class FeedbackInfoController { @Operation( summary = "添加") @PostMapping(value = "/add") - public ResResult add(@RequestBody FeedbackInfoParam param){ + public ResResult add(@Validated @RequestBody FeedbackInfoParam param, BindingResult bindingResult){ + if (bindingResult.hasErrors()){ + throw new BizException("参数绑定异常"); + } feedbackInfoService.add(param); return Res.ok(); } diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java index ac29bb65..c80e8795 100644 --- a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/param/feedback/FeedbackInfoParam.java @@ -3,6 +3,7 @@ package cn.bootx.platform.miniapp.param.feedback; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; import java.time.LocalDateTime; @@ -29,6 +30,7 @@ public class FeedbackInfoParam { private String name; @Schema(description = "反馈用户ID") private Long userId; + @Length(max = 200,min = 1,message = "反馈内容长度应处于1到1000之间") @Schema(description = "内容") private String content; -- Gitee From 6666c379995cef8d94b2347a648741a8c2a3178e Mon Sep 17 00:00:00 2001 From: xucun Date: Sat, 19 Aug 2023 22:57:23 +0800 Subject: [PATCH 26/35] =?UTF-8?q?:bug:=20=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TencentOssUploadService.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java index 7355df85..b948e115 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java @@ -92,7 +92,6 @@ public class TencentOssUploadService implements UploadService { public TempCredential getTemplateCredential() { TempCredential tempCredential; FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); - TreeMap config = new TreeMap(); config.put("secretId", oss.getSecretId()); config.put("secretKey", oss.getSecretKey()); @@ -115,6 +114,7 @@ public class TencentOssUploadService implements UploadService { "name/cos:UploadPart", "name/cos:CompleteMultipartUpload" }; + config.put("allowActions", allowActions); try { Response response = CosStsClient.getCredential(config); @@ -126,21 +126,24 @@ public class TencentOssUploadService implements UploadService { } catch (IOException e) { throw new RuntimeException(e); } - LocalDateTime startTime = LocalDateTime.now(); - LocalDateTime endTime = startTime.plus(5, MINUTES); - String keyTime = LocalDateTimeUtil.toEpochMilli(startTime) / 1000 + ":" + LocalDateTimeUtil.toEpochMilli(endTime) / 1000; + String keyTime = LocalDateTimeUtil.toEpochMilli(startTime) / 1000 + ";" + LocalDateTimeUtil.toEpochMilli(endTime) / 1000; TreeMap formData = new TreeMap<>(); ObjectNode root = objectMapper.createObjectNode(); - - root.put("expiration", endTime.plus(30, MINUTES).atZone(ZoneId.systemDefault()) - .withZoneSameInstant(ZoneId.of("Z")).withNano(0).toString()); - // root.put("expiration", endTime.plus(30, MINUTES).withNano(0).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); + root.put("expiration", endTime.plus(30, MINUTES).withNano(0).atZone(ZoneId.of("Z")) + .toString()); ArrayNode conditions = objectMapper.createArrayNode(); root.putIfAbsent("conditions", conditions); ObjectNode child = objectMapper.createObjectNode(); + child.put("acl", "default"); + child = objectMapper.createObjectNode(); child.put("bucket", oss.getBucket()); + ArrayNode tempArr = objectMapper.createArrayNode(); + tempArr.add("starts-with"); + tempArr.add("$key"); + tempArr.add("bootx/"); + conditions.addPOJO(tempArr); conditions.addPOJO(child); child = objectMapper.createObjectNode(); child.put("q-sign-algorithm", "sha1"); @@ -153,19 +156,17 @@ public class TencentOssUploadService implements UploadService { child.put("q-sign-time", keyTime); conditions.addPOJO(child); formData.put("x-cos-security-token", tempCredential.getSessionToken()); - - formData.put("policy", Base64Encoder.encode(JacksonUtil.toJson(root))); + String policyText= JacksonUtil.toJson(root); + formData.put("policy",Base64Encoder.encode(policyText)); + formData.put("acl", "default"); formData.put("q-sign-algorithm", "sha1"); - formData.put("q-ak", tempCredential.getTmpSecretId()); - formData.put("q-key-time", keyTime); - String signKey = SecureUtil.hmacSha1(tempCredential.getTmpSecretKey()).digestHex(keyTime); - String stringToSign = SecureUtil.sha1(signKey); + String stringToSign = SecureUtil.sha1().digestHex(policyText); String signature = SecureUtil.hmacSha1(signKey).digestHex(stringToSign); formData.put("q-signature", signature); - + log.info("signKey:{},stringToSign:{},signature:{}",signKey,stringToSign,signature); tempCredential.setFormData(formData); tempCredential.setUploadUrl("https://" + oss.getBucket() + ".cos.ap-beijing.myqcloud.com"); return tempCredential; -- Gitee From 9af47e938c2af2a627aba7d8d03b931eb063a9ea Mon Sep 17 00:00:00 2001 From: xxm Date: Sun, 20 Aug 2023 17:09:20 +0800 Subject: [PATCH 27/35] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96dockerfile?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 14 +++++++++---- _doc/Task.md | 1 + .../configuration/FileUploadProperties.java | 21 +++++++++++++++++-- .../src/main/resources/application-dev.yml | 4 ++++ docker-compose.yml | 2 ++ 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e34a3706..e6f9ba72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,20 @@ FROM registry.cn-beijing.aliyuncs.com/xxm1995/java8 # 作者信息 -MAINTAINER xxm1995@outlook.com +MAINTAINER bootx # 时区设置 ENV TZ=Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器, 同时读取外置日志配置 -ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -Dlogging.config=./logback-spring.xml" +# 启动命令 +ENV JAVA_COMM="-Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF-8" +# 启动选项配置 +ENV JAVA_OPTS="" +# Agent配置 +ENV JAVA_AGENT="" +# 参数配置 +ENV JAVA_ARGS="" # 工作目录 WORKDIR / @@ -21,5 +27,5 @@ EXPOSE 9999 ADD bootx-start/target/bootx-start.jar bootx-start.jar # 执行启动命令 -CMD java $JAVA_OPTS -jar bootx-start.jar +CMD java -jar $JAVA_OPTS $JAVA_AGENT $JAVA_COMM bootx-start.jar $JAVA_ARGS diff --git a/_doc/Task.md b/_doc/Task.md index 4ac085d1..1c0187d0 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -9,6 +9,7 @@ - x 用户批量重置密码 - x 代码生成模板添加批量操作相关 - 字典翻译 +- x 支持IpV6地址的记录 ## 1.3.x - 小程序工单功能 - 小程序日报功能 diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java index 96b9c633..a7344761 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/configuration/FileUploadProperties.java @@ -48,7 +48,10 @@ public class FileUploadProperties { */ private Minio minio = new Minio(); - private TencentOss tencentOss=new TencentOss(); + /** + * 腾讯云存储配置 + */ + private TencentOss tencentOss = new TencentOss(); /** * 本地存储 @@ -130,14 +133,28 @@ public class FileUploadProperties { @Setter public static class TencentOss { + /** + * 地域 + */ private String region; + /** + * 标识Id + */ private String secretId; - + /** + * 秘钥 + */ private String secretKey; + /** + * 会话Token + */ private String sessionToken; + /** + * 存储桶 + */ private String bucket; } diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index b1a4b6ec..0de0c525 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -158,6 +158,10 @@ bootx: corp-secret: ?? token: ?? encoding-aes-key: ?? + # 微信小程序 + wechat-applet: + app-id: ?? + app-secret: ?? # 认证 auth: default-password: 123456 diff --git a/docker-compose.yml b/docker-compose.yml index 41e894c3..bef10725 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,8 @@ services: restart: always ports: - "8080:8080" + environment: + - JAVA_OPTS= -Xms256m -Xmx1G -Dlogging.config=./logback-spring.xml volumes: # 读取外部化配置文件(根据实际服务器环境做修改), 宿主机目录:容器目录 - /data/logs/dax-start:/logs # 日志 -- Gitee From dbad2b36f3f0af57fbd18562a5bf0ec9fb4334cf Mon Sep 17 00:00:00 2001 From: xxm Date: Sun, 20 Aug 2023 21:44:15 +0800 Subject: [PATCH 28/35] =?UTF-8?q?perf=20keyValue=E5=AD=98=E5=82=A8,=20?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 23 +++++++++++-------- .../core/function/SystemKeyValueService.java | 4 ++-- .../core/captcha/service/CaptchaService.java | 12 +++++++--- .../chinaword/service/ChinaWordService.java | 2 ++ .../core/chinaword/wordfilter/WordFilter.java | 15 +++++------- .../core/keyvalue/entity/SysKeyValue.java | 4 ++-- .../keyvalue/service/SysKeyValueService.java | 9 ++++++-- .../dto/captcha/CaptchaDataResult.java | 3 +-- .../dto/chinaword/ChinaWordVerifyResult.java | 4 ++++ .../param/chinaword/ChinaWordParam.java | 2 +- 10 files changed, 48 insertions(+), 30 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index 1c0187d0..f0526639 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,16 +1,20 @@ ## 1.3.4 -- 通用导入组件 - - 支持自定义模板下载 - - 模板管理 - - 支持自定义上传到的地址 - - 导入数据支持选择: 跳过, 覆盖, 报错 +- x 通用导入组件 + - x 支持自定义模板下载 + - x 模板管理 + - x 支持自定义上传到的地址 + - x 导入数据支持选择: 跳过, 覆盖, 报错 - x 小程序用户反馈功能 - x 敏感字功能 - x 用户批量重置密码 - x 代码生成模板添加批量操作相关 -- 字典翻译 - x 支持IpV6地址的记录 -## 1.3.x +## 1.3.5 +- 参数配置支持只允许后端访问 +- 键值对管理增加可视化界面管理 +- 审计日志增加定时删除和一键清除超期日志功能 +- 文件管理支持配置所属上传类型、是否被使用过、是否登陆后才可以访问 +## 1.3.x、1.4.x - 小程序工单功能 - 小程序日报功能 - PostgreSQL 数据库适配 @@ -20,10 +24,9 @@ - 代码生成模板支持配置 - 代码生成支持预览 - Sql查询功能 +- SQL查询片段升级为数据集 - 支持预览编辑完成的富文本 - 添加配置备份功能(菜单/系统参数/字典), csv方式 -- 添加各种导入和导出功能 -- 导入数据支持选择: 跳过, 覆盖, 报错 - 添加各种批量操作功能 - 一键缓存同步和更新操作(字典/参数) - 加密模块支持主键加密 @@ -32,3 +35,5 @@ - 密码多少天必须更改，且不能与前N次相同功能 - 对上传的文件管理还需要完善, 例如改文件是否还被使用, 上传场景是什么样的一类 - 前端首页分析页面需要重做，接入真实数据 +- 可视化大屏端支持一键登录 +- 可视化大屏支持快速对接数据集 diff --git a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java index 293c2595..ea90fa12 100644 --- a/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java +++ b/bootx-common-core/src/main/java/cn/bootx/platform/common/core/function/SystemKeyValueService.java @@ -23,12 +23,12 @@ public interface SystemKeyValueService { List gets(List keys); /** - * 设置值 + * 设置值, 如果key不存在将会创建，key存在则会更新 */ void setup(String key, String value); /** - * 设置多个 + * 保存多个值 */ void setupBatch(List list); diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java index 0cbd05de..ff3abf90 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/captcha/service/CaptchaService.java @@ -48,6 +48,7 @@ public class CaptchaService { /** * 校验图片验证码 + * @param key 验证码Key */ public boolean validateImgCaptcha(String key, String captcha) { // 比较验证码是否正确 @@ -56,7 +57,8 @@ public class CaptchaService { } /** - * 失效图片验证码 + * 将图片验证码设置为失效 + * @param key 验证码Key */ public void deleteImgCaptcha(String key) { redisClient.deleteKey(imgCaptchaPrefix + key); @@ -64,6 +66,10 @@ public class CaptchaService { /** * 发送手机验证码 + * @param phone 手机号 + * @param timeoutSec 超时时间 + * @param type 业务类型, 用来区分不同业务的短信验证码 + * @return 验证码 */ public int sendSmsCaptcha(String phone, long timeoutSec, String type) { int captcha = RandomUtil.randomInt(100000, 1000000); @@ -73,7 +79,7 @@ public class CaptchaService { } /** - * 手机发送的验证码是否还有效 + * 验证手机发送的验证码是否还在有效时间内 */ public boolean existsSmsCaptcha(String phone, String type) { return redisClient.exists(getSmsCaptchaPrefix(type) + phone); @@ -89,7 +95,7 @@ public class CaptchaService { } /** - * 失效手机验证码 + * 将手机验证码验证码设置为失效 */ public void deleteSmsCaptcha(String phone, String type) { redisClient.deleteKey(getSmsCaptchaPrefix(type) + phone); diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java index 339bdd0c..91ecac63 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/service/ChinaWordService.java @@ -120,8 +120,10 @@ public class ChinaWordService { if (wordFilter.include(text,skip)) { String replaceText = wordFilter.replace(text, skip, symbol); int count = wordFilter.wordCount(text, skip); + Set wordList = wordFilter.wordList(text, skip); result.setText(replaceText) .setCount(count) + .setSensitiveWords(wordList) .setSensitive(true); } return result; diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java index b787918e..f558ceb5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/wordfilter/WordFilter.java @@ -3,10 +3,7 @@ package cn.bootx.platform.baseapi.core.chinaword.wordfilter; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * 敏感词过滤器 @@ -139,7 +136,7 @@ public class WordFilter { * * @param text 输入文本 */ - public List wordList(final String text) { + public Set wordList(String text) { return wordList(text, 0); } @@ -149,8 +146,8 @@ public class WordFilter { * @param text 输入文本 * @param skip 文本距离 */ - public List wordList(final String text, final int skip) { - List wordList = new ArrayList<>(); + public Set wordList(final String text, final int skip) { + Set wordSet = new LinkedHashSet<>(); char[] charset = text.toCharArray(); for (int i = 0; i < charset.length; i++) { FlagIndex fi = getFlagIndex(charset, i, skip); @@ -163,11 +160,11 @@ public class WordFilter { char word = text.charAt(j); builder.append(word); } - wordList.add(builder.toString()); + wordSet.add(builder.toString()); } } } - return wordList; + return wordSet; } /** diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java index 45e0258b..8efc40ad 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/entity/SysKeyValue.java @@ -1,7 +1,7 @@ package cn.bootx.platform.baseapi.core.keyvalue.entity; import cn.bootx.platform.common.core.rest.dto.KeyValue; -import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.common.mybatisplus.base.MpDelEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; @@ -21,7 +21,7 @@ import lombok.experimental.Accessors; @AllArgsConstructor @Accessors(chain = true) @TableName("base_key_value") -public class SysKeyValue extends MpBaseEntity { +public class SysKeyValue extends MpDelEntity { /** * key值 diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java index c994548d..d0f958c4 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/keyvalue/service/SysKeyValueService.java @@ -7,6 +7,7 @@ import cn.bootx.platform.baseapi.core.keyvalue.entity.SysKeyValue; 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; @@ -54,11 +55,15 @@ public class SysKeyValueService implements SystemKeyValueService { } /** - * 设置多个 + * 保存多个值 */ @Override + @Transactional(rollbackFor = Exception.class) public void setupBatch(List list) { - + List collect = list.stream() + .map(SysKeyValue::init) + .collect(Collectors.toList()); + sysKeyValueManager.saveAll(collect); } } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java index 936dd5f6..234324a1 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/captcha/CaptchaDataResult.java @@ -1,6 +1,5 @@ package cn.bootx.platform.baseapi.dto.captcha; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; @@ -16,7 +15,7 @@ import lombok.experimental.Accessors; @Schema(title = "验证码数据") public class CaptchaDataResult { - @Schema(description = "验证码标示") + @Schema(description = "验证码标识KEY") private String captchaKey; @Schema(description = "验证码base64数据") diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java index e10767a5..dc8887f5 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/dto/chinaword/ChinaWordVerifyResult.java @@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import java.util.Set; + /** * 敏感词验证结果 * @author xxm @@ -18,6 +20,8 @@ public class ChinaWordVerifyResult { private boolean sensitive; @Schema(description = "敏感词数量") private int count; + @Schema(description = "去重后的敏感词列表") + private Set sensitiveWords; @Schema(description = "脱敏后的文本") private String text; } diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java index 96fe607e..3e5c1fc7 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/param/chinaword/ChinaWordParam.java @@ -25,7 +25,7 @@ public class ChinaWordParam { private String description; @Schema(description = "是否启用") private Boolean enable; - @Schema(description = "是否是白名单名词") + @Schema(description = "白名单名词") private Boolean white; } -- Gitee From 8419f25eb38adefd6d6add5698e39f2a2da729f3 Mon Sep 17 00:00:00 2001 From: xucun Date: Sun, 20 Aug 2023 23:48:07 +0800 Subject: [PATCH 29/35] =?UTF-8?q?:sparkles:=20=E5=BE=AE=E4=BF=A1=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E3=80=81=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A=E4=B8=8E?= =?UTF-8?q?=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TencentOssUploadService.java | 78 +++++++++++++++++-- .../auth/login/WeChatAppletLoginHandler.java | 27 ++++++- .../third/service/UserThirdBindService.java | 6 +- .../third/service/UserThirdQueryService.java | 1 + .../service/UserTiredOperateService.java | 4 +- .../iam/dto/user/UserThirdBindInfo.java | 4 + 6 files changed, 106 insertions(+), 14 deletions(-) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java index b948e115..3d3838d5 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java @@ -1,5 +1,6 @@ package cn.bootx.platform.starter.file.service.impl; +import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; import cn.bootx.platform.starter.file.configuration.FileUploadProperties; @@ -10,6 +11,7 @@ import cn.bootx.platform.starter.file.service.UploadService; import cn.hutool.core.codec.Base64Encoder; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.SystemClock; +import cn.hutool.core.util.RandomUtil; import cn.hutool.crypto.SecureUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -19,8 +21,18 @@ import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; import com.qcloud.cos.auth.COSCredentials; +import com.qcloud.cos.exception.CosClientException; +import com.qcloud.cos.exception.CosServiceException; +import com.qcloud.cos.http.HttpMethodName; import com.qcloud.cos.http.HttpProtocol; +import com.qcloud.cos.model.GeneratePresignedUrlRequest; +import com.qcloud.cos.model.ObjectMetadata; +import com.qcloud.cos.model.PutObjectRequest; +import com.qcloud.cos.model.UploadResult; import com.qcloud.cos.region.Region; +import com.qcloud.cos.transfer.TransferManager; +import com.qcloud.cos.transfer.TransferManagerConfiguration; +import com.qcloud.cos.transfer.Upload; import com.tencent.cloud.CosStsClient; import com.tencent.cloud.Response; import lombok.RequiredArgsConstructor; @@ -33,14 +45,18 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; +import java.net.URL; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoField; import java.time.temporal.ChronoUnit; import java.util.Base64; +import java.util.Date; import java.util.Objects; import java.util.TreeMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import static java.time.temporal.ChronoUnit.MINUTES; @@ -59,6 +75,7 @@ public class TencentOssUploadService implements UploadService { private final ObjectMapper objectMapper; COSClient client; + TransferManager transferManager; @Override public boolean enable(FileUploadTypeEnum type) { @@ -71,22 +88,62 @@ public class TencentOssUploadService implements UploadService { @Override public UpdateFileInfo upload(MultipartFile file, UploadFileContext context) { - return null; + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + ObjectMetadata objectMetadata = new ObjectMetadata(); + objectMetadata.setContentLength(file.getSize()); + PutObjectRequest putObjectRequest; + UploadResult uploadResult; + try { + putObjectRequest = new PutObjectRequest(oss.getBucket(), context.getFileId().toString(), file.getInputStream(), objectMetadata); + } catch (IOException e) { + throw new RuntimeException(e); + } + try { + // 高级接口会返回一个异步结果Upload + // 可同步地调用 waitForUploadResult 方法等待上传完成，成功返回 UploadResult, 失败抛出异常 + Upload upload = transferManager.upload(putObjectRequest); + uploadResult = upload.waitForUploadResult(); + } catch (CosClientException | InterruptedException e) { + e.printStackTrace(); + log.error("上传失败，原因:", e); + throw new BizException("上传失败"); + } + + return new UpdateFileInfo().setExternalStorageId(uploadResult.getKey()).setFileSize(file.getSize()); } @Override public void preview(UpdateFileInfo updateFileInfo, HttpServletResponse response) { - + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + String key = updateFileInfo.getExternalStorageId(); + GeneratePresignedUrlRequest req = + new GeneratePresignedUrlRequest(oss.getBucket(), key, HttpMethodName.GET); + Date expirationDate = new Date(System.currentTimeMillis() + 30L * 60L * 1000L); + req.setExpiration(expirationDate); + URL url = client.generatePresignedUrl(req); + response.encodeRedirectURL(url.toString()); } @Override public InputStream download(UpdateFileInfo updateFileInfo) { - return null; + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + String key = updateFileInfo.getExternalStorageId(); + GeneratePresignedUrlRequest req = + new GeneratePresignedUrlRequest(oss.getBucket(), key, HttpMethodName.GET); + Date expirationDate = new Date(System.currentTimeMillis() + 30L * 60L * 1000L); + req.setExpiration(expirationDate); + URL url = client.generatePresignedUrl(req); + try { + return url.openStream(); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override public void delete(UpdateFileInfo updateFileInfo) { - + FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); + client.deleteObject(oss.getBucket(), updateFileInfo.getFileName()); } public TempCredential getTemplateCredential() { @@ -156,8 +213,8 @@ public class TencentOssUploadService implements UploadService { child.put("q-sign-time", keyTime); conditions.addPOJO(child); formData.put("x-cos-security-token", tempCredential.getSessionToken()); - String policyText= JacksonUtil.toJson(root); - formData.put("policy",Base64Encoder.encode(policyText)); + String policyText = JacksonUtil.toJson(root); + formData.put("policy", Base64Encoder.encode(policyText)); formData.put("acl", "default"); formData.put("q-sign-algorithm", "sha1"); formData.put("q-ak", tempCredential.getTmpSecretId()); @@ -166,7 +223,7 @@ public class TencentOssUploadService implements UploadService { String stringToSign = SecureUtil.sha1().digestHex(policyText); String signature = SecureUtil.hmacSha1(signKey).digestHex(stringToSign); formData.put("q-signature", signature); - log.info("signKey:{},stringToSign:{},signature:{}",signKey,stringToSign,signature); + log.info("signKey:{},stringToSign:{},signature:{}", signKey, stringToSign, signature); tempCredential.setFormData(formData); tempCredential.setUploadUrl("https://" + oss.getBucket() + ".cos.ap-beijing.myqcloud.com"); return tempCredential; @@ -184,5 +241,12 @@ public class TencentOssUploadService implements UploadService { clientConfig.setHttpProtocol(HttpProtocol.https); COSCredentials cred = new BasicCOSCredentials(oss.getSecretId(), oss.getSecretKey()); client = new COSClient(cred, clientConfig); + ExecutorService threadPool = Executors.newFixedThreadPool(32); + transferManager = new TransferManager(client, threadPool); + TransferManagerConfiguration transferManagerConfiguration = new TransferManagerConfiguration(); + transferManagerConfiguration.setMultipartUploadThreshold(5 * 1024 * 1024); + transferManagerConfiguration.setMinimumUploadPartSize(1 * 1024 * 1024); + transferManager.setConfiguration(transferManagerConfiguration); + } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java index a3d008ec..448fe580 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/auth/login/WeChatAppletLoginHandler.java @@ -2,9 +2,12 @@ package cn.bootx.platform.iam.core.auth.login; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.iam.core.third.dao.UserThirdManager; import cn.bootx.platform.iam.core.third.entity.UserThird; +import cn.bootx.platform.iam.core.third.entity.UserThirdInfo; +import cn.bootx.platform.iam.core.third.service.UserTiredOperateService; import cn.bootx.platform.iam.core.user.dao.UserInfoManager; import cn.bootx.platform.iam.core.user.entity.UserInfo; import cn.bootx.platform.starter.auth.authentication.OpenIdAuthentication; @@ -14,6 +17,8 @@ import cn.bootx.platform.starter.auth.entity.AuthInfoResult; import cn.bootx.platform.starter.auth.entity.LoginAuthContext; import cn.bootx.platform.starter.auth.entity.ThirdAuthCode; import cn.bootx.platform.starter.auth.exception.LoginFailureException; +import cn.bootx.platform.starter.auth.util.SecurityUtil; +import cn.bootx.platform.starter.wechat.core.user.service.WeChatUserService; import cn.hutool.http.HttpUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,6 +31,7 @@ import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.Map; +import java.util.Objects; @Slf4j @Component @@ -33,12 +39,16 @@ import java.util.Map; public class WeChatAppletLoginHandler implements OpenIdAuthentication { + private final UserTiredOperateService userTiredOperateService; private final WxMaService wxMaService; private final UserThirdManager userThirdManager; private final UserInfoManager userInfoManager; + + private final WeChatUserService weChatUserService; + @Override public String getLoginType() { return AuthLoginTypeCode.WE_CHAT_APPLET; @@ -98,8 +108,8 @@ public class WeChatAppletLoginHandler implements OpenIdAuthentication { WxMaJscode2SessionResult result = wxMaService.getUserService().getSessionInfo(authCode); log.debug("微信服务器返回的用户信息:{}", JacksonUtil.toJson(result)); return AuthUser.builder() - .avatar(null) - .uuid(result.getUnionid()). + .avatar("") + .uuid(result.getOpenid()). nickname("未知") .username("未知") .avatar("未知") @@ -113,6 +123,17 @@ public class WeChatAppletLoginHandler implements OpenIdAuthentication { @Override public void bindUser(String authCode, String state) { - OpenIdAuthentication.super.bindUser(authCode, state); + Long userId = SecurityUtil.getUserId(); + AuthUser authUser = this.getAuthUser(authCode, state); + userTiredOperateService.checkOpenIdBind(authUser.getUuid(), UserThird::getWeChatId); + userTiredOperateService.bindOpenId(userId, authUser.getUuid(), UserThird::setWeChatId); + + UserThirdInfo userThirdInfo = new UserThirdInfo().setUserId(userId) + .setClientCode(AuthLoginTypeCode.WE_CHAT) + .setUsername(authUser.getUsername()) + .setNickname(authUser.getNickname()) + .setAvatar(authUser.getAvatar()) + .setThirdUserId(authUser.getUuid()); + userTiredOperateService.bindOpenInfo(userThirdInfo); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java index fa10f824..305cb06d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdBindService.java @@ -76,9 +76,9 @@ public class UserThirdBindService { */ private OpenIdAuthentication getOpenIdAuthentication(String clientCode) { return openIdAuthentications.stream() - .filter(o -> o.adaptation(clientCode)) - .findFirst() - .orElseThrow(() -> new LoginFailureException("未找到对应的终端认证器")); + .filter(o -> o.adaptation(clientCode)) + .findFirst() + .orElseThrow(() -> new LoginFailureException("未找到对应的终端认证器")); } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java index 4fb19099..5eedbfb1 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java @@ -64,6 +64,7 @@ public class UserThirdQueryService { userThirdBindInfo.setWeChatOpen(getBindInfo(thirdInfoMap, AuthLoginTypeCode.WE_CHAT_OPEN)); userThirdBindInfo.setWeCom(getBindInfo(thirdInfoMap, AuthLoginTypeCode.WE_COM)); userThirdBindInfo.setDingTalk(getBindInfo(thirdInfoMap, AuthLoginTypeCode.DING_TALK)); + return userThirdBindInfo; } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java index f0474293..6f19003c 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserTiredOperateService.java @@ -81,9 +81,11 @@ public class UserTiredOperateService { */ @Transactional(rollbackFor = Exception.class) public void bindOpenInfo(UserThirdInfo userThirdInfo) { - // 详细信息 存在就删除重新添加 + userThirdInfoManager.deleteByUserAndClientCode(userThirdInfo.getUserId(), userThirdInfo.getClientCode()); + userThirdInfoManager.save(userThirdInfo); + } } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java index 86174d26..1e17df19 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java @@ -29,6 +29,10 @@ public class UserThirdBindInfo { @Schema(description = "钉钉绑定信息") private BindInfo dingTalk; + @Schema(description = "钉钉绑定信息") + private BindInfo weChatApplet; + + @Getter @Setter @Schema(title = "用户信息") -- Gitee From 060d711412406a251671e081c029d55fc008b17c Mon Sep 17 00:00:00 2001 From: xucun Date: Mon, 21 Aug 2023 13:32:38 +0800 Subject: [PATCH 30/35] =?UTF-8?q?:sparkles:=20=E8=8E=B7=E5=8F=96=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=BB=91=E5=AE=9A=E4=BF=A1=E6=81=AF=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0uuid,=E6=B7=BB=E5=8A=A0=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96=E6=9C=AA=E8=AF=BB=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third/service/UserThirdQueryService.java | 1 + .../iam/dto/user/UserThirdBindInfo.java | 3 + .../controller/SiteMessageController.java | 8 +- .../core/site/dao/SiteMessageManager.java | 68 +++++++++------ .../core/site/service/SiteMessageService.java | 83 ++++++++++--------- 5 files changed, 98 insertions(+), 65 deletions(-) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java index 5eedbfb1..56e3b574 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/third/service/UserThirdQueryService.java @@ -77,6 +77,7 @@ public class UserThirdQueryService { if (Objects.nonNull(userThirdInfo)) { bindInfo.setBind(true); bindInfo.setUsername(userThirdInfo.getUsername()); + bindInfo.setThirdUserId(userThirdInfo.getThirdUserId()); } return bindInfo; } diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java index 1e17df19..52c1d75d 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/dto/user/UserThirdBindInfo.java @@ -44,6 +44,9 @@ public class UserThirdBindInfo { @Schema(description = "名称") private String username; + @Schema(description = "第三方UUID") + private String thirdUserId; + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java index 3106d874..8be46dca 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/controller/SiteMessageController.java @@ -13,6 +13,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author xxm * @since 2021/8/8 @@ -83,5 +85,9 @@ public class SiteMessageController { siteMessageService.read(id); return Res.ok(); } - + @Operation(summary = "小程序获取未读的接收消息标题列表") + @GetMapping("/listByReceiveNotRead") + public ResResult> listByReceiveNotRead(SiteMessageInfo query) { + return Res.ok(siteMessageService.listByReceiveNotRead(query)); + } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java index e2749ce5..7df9a5dd 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/dao/SiteMessageManager.java @@ -15,7 +15,9 @@ import lombok.val; import org.springframework.stereotype.Repository; import java.time.LocalDate; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import static cn.bootx.platform.notice.code.SiteMessageCode.STATE_SENT; @@ -37,15 +39,15 @@ public class SiteMessageManager extends BaseManager() - .and(o -> o - .and(p -> p.eq(SiteMessageInfo::getReceiveType, SiteMessageCode.RECEIVE_ALL) - .gt(SiteMessageInfo::getEfficientTime, LocalDate.now())) - .or() - .eq(SiteMessageInfo::getReceiveId, userId)) - .eq(SiteMessageInfo::getSendState, STATE_SENT) - .eq(StrUtil.isNotBlank(query.getTitle()), SiteMessageInfo::getTitle, query.getTitle()) - .orderByAsc(SiteMessageInfo::getHaveRead) - .orderByDesc(SiteMessageInfo::getReadTime); + .and(o -> o + .and(p -> p.eq(SiteMessageInfo::getReceiveType, SiteMessageCode.RECEIVE_ALL) + .gt(SiteMessageInfo::getEfficientTime, LocalDate.now())) + .or() + .eq(SiteMessageInfo::getReceiveId, userId)) + .eq(SiteMessageInfo::getSendState, STATE_SENT) + .eq(StrUtil.isNotBlank(query.getTitle()), SiteMessageInfo::getTitle, query.getTitle()) + .orderByAsc(SiteMessageInfo::getHaveRead) + .orderByDesc(SiteMessageInfo::getReadTime); if (Objects.equals(query.getHaveRead(), true)) { wrapper.eq(SiteMessageInfo::getHaveRead, query.getHaveRead()); } @@ -63,30 +65,48 @@ public class SiteMessageManager extends BaseManager() - .and(o -> o - .and(p -> p.eq(SiteMessageInfo::getReceiveType, SiteMessageCode.RECEIVE_ALL) - .gt(SiteMessageInfo::getEfficientTime, LocalDate.now())) - .or() - .eq(SiteMessageInfo::getReceiveId, userId)) - .and(o -> o.eq(SiteMessageInfo::getHaveRead, false).or().isNull(SiteMessageInfo::getHaveRead)) - .eq(SiteMessageInfo::getSendState, STATE_SENT) - .orderByAsc(SiteMessageInfo::getHaveRead) - .orderByDesc(SiteMessageInfo::getReadTime); + .and(o -> o + .and(p -> p.eq(SiteMessageInfo::getReceiveType, SiteMessageCode.RECEIVE_ALL) + .gt(SiteMessageInfo::getEfficientTime, LocalDate.now())) + .or() + .eq(SiteMessageInfo::getReceiveId, userId)) + .and(o -> o.eq(SiteMessageInfo::getHaveRead, false).or().isNull(SiteMessageInfo::getHaveRead)) + .eq(SiteMessageInfo::getSendState, STATE_SENT) + .orderByAsc(SiteMessageInfo::getHaveRead) + .orderByDesc(SiteMessageInfo::getReadTime); return baseMapper.countMassage(wrapper); } + public List listByReceiveNotRead(Long userId) { + Page page = new Page<>(); + page.setSize(5); + page.setSize(1); + val wrapper = new LambdaQueryWrapper() + .and(o -> o + .and(p -> p.eq(SiteMessageInfo::getReceiveType, SiteMessageCode.RECEIVE_ALL) + .gt(SiteMessageInfo::getEfficientTime, LocalDate.now())) + .or() + .eq(SiteMessageInfo::getReceiveId, userId)) + .and(o -> o.eq(SiteMessageInfo::getHaveRead, false).or().isNull(SiteMessageInfo::getHaveRead)) + .eq(SiteMessageInfo::getSendState, STATE_SENT) + .orderByAsc(SiteMessageInfo::getHaveRead) + .orderByDesc(SiteMessageInfo::getReadTime); + return baseMapper.pageMassage(page, wrapper).getRecords().stream() + .map(SiteMessageInfo::getTitle).collect(Collectors.toList()); + } + /** * 发送人消息分页 */ public Page pageBySender(PageParam pageParam, SiteMessageInfo query, Long userId) { Page mpPage = MpUtil.getMpPage(pageParam, SiteMessage.class); return lambdaQuery().select(SiteMessage.class, MpUtil::excludeBigField) - .eq(SiteMessage::getSenderId, userId) - .like(StrUtil.isNotBlank(query.getTitle()), SiteMessage::getSenderId, query.getTitle()) - .eq(StrUtil.isNotBlank(query.getSendState()), SiteMessage::getSendState, query.getSendState()) - .eq(StrUtil.isNotBlank(query.getReceiveType()), SiteMessage::getReceiveType, query.getReceiveType()) - .orderByDesc(SiteMessage::getId) - .page(mpPage); + .eq(SiteMessage::getSenderId, userId) + .like(StrUtil.isNotBlank(query.getTitle()), SiteMessage::getSenderId, query.getTitle()) + .eq(StrUtil.isNotBlank(query.getSendState()), SiteMessage::getSendState, query.getSendState()) + .eq(StrUtil.isNotBlank(query.getReceiveType()), SiteMessage::getReceiveType, query.getReceiveType()) + .orderByDesc(SiteMessage::getId) + .page(mpPage); } } diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java index cc2bea17..32006082 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/site/service/SiteMessageService.java @@ -60,30 +60,29 @@ public class SiteMessageService { SiteMessage siteMessage; if (Objects.nonNull(param.getId())) { siteMessage = siteMessageManager.findById(param.getId()) - .orElseThrow(() -> new DataNotExistException("站内信信息不存在")); + .orElseThrow(() -> new DataNotExistException("站内信信息不存在")); BeanUtil.copyProperties(param, siteMessage, CopyOptions.create().ignoreNullValue()); - } - else { + } else { siteMessage = new SiteMessage().setTitle(param.getTitle()) - .setSendState(STATE_DRAFT) - .setContent(param.getContent()) - .setReceiveType(param.getReceiveType()) - .setEfficientTime(param.getEfficientTime()) - .setSenderTime(LocalDateTime.now()); + .setSendState(STATE_DRAFT) + .setContent(param.getContent()) + .setReceiveType(param.getReceiveType()) + .setEfficientTime(param.getEfficientTime()) + .setSenderTime(LocalDateTime.now()); // 添加消息关联人信息 暂时这段逻辑用不到, 现在发布的都是全体用户信心 if (Objects.equals(RECEIVE_USER, param.getReceiveType())) { List siteMessageUsers = param.getReceiveIds() - .stream() - .map(userId -> new SiteMessageUser().setMessageId(param.getId()).setReceiveId(userId)) - .collect(Collectors.toList()); + .stream() + .map(userId -> new SiteMessageUser().setMessageId(param.getId()).setReceiveId(userId)) + .collect(Collectors.toList()); siteMessageUserManager.saveAll(siteMessageUsers); } } // 新增或更新站内信内容 val userDetail = SecurityUtil.getCurrentUser(); siteMessage.setTitle(param.getTitle()) - .setSenderId(userDetail.map(UserDetail::getId).orElse(DesensitizedUtil.userId())) - .setSenderName(userDetail.map(UserDetail::getName).orElse("未知")); + .setSenderId(userDetail.map(UserDetail::getId).orElse(DesensitizedUtil.userId())) + .setSenderName(userDetail.map(UserDetail::getName).orElse("未知")); siteMessageManager.saveOrUpdate(siteMessage); } @@ -94,14 +93,14 @@ public class SiteMessageService { @Transactional(rollbackFor = Exception.class) public void send(Long id) { SiteMessage siteMessage = siteMessageManager.findById(id) - .orElseThrow(() -> new DataNotExistException("站内信信息不存在")); + .orElseThrow(() -> new DataNotExistException("站内信信息不存在")); val userDetail = SecurityUtil.getCurrentUser(); // 新增站内信内容 siteMessage.setSenderId(userDetail.map(UserDetail::getId).orElse(DesensitizedUtil.userId())) - .setSendState(STATE_SENT) - .setSenderName(userDetail.map(UserDetail::getName).orElse("未知")) - .setSenderTime(LocalDateTime.now()); + .setSendState(STATE_SENT) + .setSenderName(userDetail.map(UserDetail::getName).orElse("未知")) + .setSenderTime(LocalDateTime.now()); siteMessageManager.updateById(siteMessage); userWsNoticeService.sendMessageByAll(WsRes.eventNotice(EVENT_MESSAGE_UPDATE)); } @@ -114,21 +113,21 @@ public class SiteMessageService { // 新增站内信内容 SiteMessage siteMessage = new SiteMessage().setTitle(param.getTitle()) - .setContent(param.getContent()) - .setSendState(STATE_SENT) - .setReceiveType(param.getReceiveType()) - .setEfficientTime(param.getEfficientTime()) - .setSenderId(param.getSenderId()) - .setSenderName(param.getSenderName()) - .setSenderTime(LocalDateTime.now()); + .setContent(param.getContent()) + .setSendState(STATE_SENT) + .setReceiveType(param.getReceiveType()) + .setEfficientTime(param.getEfficientTime()) + .setSenderId(param.getSenderId()) + .setSenderName(param.getSenderName()) + .setSenderTime(LocalDateTime.now()); siteMessageManager.save(siteMessage); // 添加消息关联人信息 if (Objects.equals(RECEIVE_USER, param.getReceiveType())) { List siteMessageUsers = param.getReceiveIds() - .stream() - .map(userId -> new SiteMessageUser().setMessageId(siteMessage.getId()).setReceiveId(userId)) - .collect(Collectors.toList()); + .stream() + .map(userId -> new SiteMessageUser().setMessageId(siteMessage.getId()).setReceiveId(userId)) + .collect(Collectors.toList()); siteMessageUserManager.saveAll(siteMessageUsers); userWsNoticeService.sendMessageByUsers(WsRes.eventNotice(EVENT_MESSAGE_UPDATE), param.getReceiveIds()); } @@ -139,11 +138,11 @@ public class SiteMessageService { */ public void sendSingleUserBySystem(String title, String content, Long userId) { val param = new SendSiteMessageParam().setTitle(title) - .setContent(content) - .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) - .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) - .setReceiveType(RECEIVE_USER) - .setReceiveIds(Collections.singletonList(userId)); + .setContent(content) + .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) + .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) + .setReceiveType(RECEIVE_USER) + .setReceiveIds(Collections.singletonList(userId)); this.send(param); } @@ -152,11 +151,11 @@ public class SiteMessageService { */ public void sendMultiUserBySystem(String title, String content, List userIds) { val param = new SendSiteMessageParam().setTitle(title) - .setContent(content) - .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) - .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) - .setReceiveType(RECEIVE_USER) - .setReceiveIds(userIds); + .setContent(content) + .setSenderId(CommonCode.SYSTEM_DEFAULT_USERID) + .setSenderName(CommonCode.SYSTEM_DEFAULT_USERNAME) + .setReceiveType(RECEIVE_USER) + .setReceiveIds(userIds); this.send(param); } @@ -166,7 +165,7 @@ public class SiteMessageService { @Transactional(rollbackFor = Exception.class) public void cancel(Long messageId) { SiteMessage siteMessage = siteMessageManager.findById(messageId) - .orElseThrow(() -> new DataNotExistException("站内信不存在")); + .orElseThrow(() -> new DataNotExistException("站内信不存在")); siteMessage.setCancelTime(LocalDateTime.now()).setSendState(STATE_CANCEL); siteMessageManager.updateById(siteMessage); userWsNoticeService.sendMessageByAll(WsRes.eventNotice(EVENT_MESSAGE_UPDATE)); @@ -178,7 +177,7 @@ public class SiteMessageService { @Transactional(rollbackFor = Exception.class) public void delete(Long messageId) { SiteMessage siteMessage = siteMessageManager.findById(messageId) - .orElseThrow(() -> new DataNotExistException("站内信不存在")); + .orElseThrow(() -> new DataNotExistException("站内信不存在")); if (!CollUtil.toList(STATE_CANCEL, STATE_DRAFT).contains(siteMessage.getSendState())) { throw new BizException("站内信不是撤回或草稿状态，无法被删除"); } @@ -225,9 +224,13 @@ public class SiteMessageService { Long userId = SecurityUtil.getUserId(); // Long userId = 0L; SiteMessageUser siteMessageUser = siteMessageUserManager.findByMessageId(messageId) - .orElse(new SiteMessageUser().setReceiveId(userId).setMessageId(messageId)); + .orElse(new SiteMessageUser().setReceiveId(userId).setMessageId(messageId)); siteMessageUser.setHaveRead(true).setReadTime(LocalDateTime.now()); siteMessageUserManager.saveOrUpdate(siteMessageUser); } + public List listByReceiveNotRead(SiteMessageInfo query) { + Long userId = SecurityUtil.getUserId(); + return siteMessageManager.listByReceiveNotRead(userId); + } } -- Gitee From 7a7a3ff2b21fa92fafdf1bb1dd9b3c22ea837189 Mon Sep 17 00:00:00 2001 From: xucun Date: Tue, 22 Aug 2023 17:10:41 +0800 Subject: [PATCH 31/35] =?UTF-8?q?:sparkles:=20=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=88=B0?= =?UTF-8?q?=E8=85=BE=E8=AE=AF=E4=BA=91OSS=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/FIleUpLoadController.java | 15 ++++-- ...TempCredential.java => UpLoadOptions.java} | 4 +- .../file/service/FileUploadService.java | 11 +++- .../service/impl/TencentOssUploadService.java | 50 +++++++++---------- 4 files changed, 47 insertions(+), 33 deletions(-) rename bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/{TempCredential.java => UpLoadOptions.java} (85%) diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java index 828f8830..eec514d9 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/controller/FIleUpLoadController.java @@ -5,8 +5,9 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.Res; import cn.bootx.platform.common.core.rest.ResResult; import cn.bootx.platform.common.core.rest.param.PageParam; -import cn.bootx.platform.starter.file.dto.TempCredential; +import cn.bootx.platform.starter.file.dto.UpLoadOptions; import cn.bootx.platform.starter.file.dto.UpdateFileDto; +import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import cn.bootx.platform.starter.file.service.FileUploadService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -40,6 +41,7 @@ public class FIleUpLoadController { return Res.ok(uploadService.page(pageParam)); } + @IgnoreAuth(ignore = false, login = true) @Operation(summary = "上传") @PostMapping("/upload") @@ -85,9 +87,16 @@ public class FIleUpLoadController { } @Operation(summary = "获取临时oss密钥") - @GetMapping("/getTempCredentials") - public ResResult getTempCredentials() { + @GetMapping("/getUpLoadOptions") + public ResResult getTempCredentials() { return Res.ok(uploadService.getTempCredentials()); } + @Operation(summary = "保存记录") + @PostMapping("/saveUploadResult") + public ResResult saveUploadResult(@RequestBody UpdateFileInfo info) { + return Res.ok(uploadService.saveUploadResult(info)); + } + + } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpLoadOptions.java similarity index 85% rename from bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java rename to bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpLoadOptions.java index 33b7c686..c94d00e9 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/TempCredential.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/dto/UpLoadOptions.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.TreeMap; @Data -public class TempCredential { +public class UpLoadOptions { private String tmpSecretId; private String tmpSecretKey; private String sessionToken; @@ -16,4 +16,6 @@ public class TempCredential { private String uploadUrl; + private String key; + } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java index 0d23ee54..7d1a7126 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/FileUploadService.java @@ -8,7 +8,7 @@ import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.starter.file.dao.UpdateFileManager; -import cn.bootx.platform.starter.file.dto.TempCredential; +import cn.bootx.platform.starter.file.dto.UpLoadOptions; import cn.bootx.platform.starter.file.dto.UpdateFileDto; import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import cn.bootx.platform.starter.file.entity.UploadFileContext; @@ -191,7 +191,7 @@ public class FileUploadService { return serverUrl; } - public TempCredential getTempCredentials() { + public UpLoadOptions getTempCredentials() { TencentOssUploadService ossUploadService=(TencentOssUploadService)uploadServices.stream().filter(s -> s.enable(FileUploadTypeEnum.TENCENT_OSS)) .findFirst().orElseThrow(() -> new BizException("未找到该类文件的处理器")); @@ -199,4 +199,11 @@ public class FileUploadService { return ossUploadService.getTemplateCredential(); } + + public UpdateFileDto saveUploadResult(UpdateFileInfo uploadInfo) { + + uploadInfo.setId(IdUtil.getSnowflakeNextId()); + updateFileManager.save(uploadInfo); + return uploadInfo.toDto(); + } } diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java index 3d3838d5..efd397fc 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/service/impl/TencentOssUploadService.java @@ -4,25 +4,21 @@ import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.jackson.util.JacksonUtil; import cn.bootx.platform.starter.file.code.FileUploadTypeEnum; import cn.bootx.platform.starter.file.configuration.FileUploadProperties; -import cn.bootx.platform.starter.file.dto.TempCredential; +import cn.bootx.platform.starter.file.dto.UpLoadOptions; import cn.bootx.platform.starter.file.entity.UpdateFileInfo; import cn.bootx.platform.starter.file.entity.UploadFileContext; import cn.bootx.platform.starter.file.service.UploadService; import cn.hutool.core.codec.Base64Encoder; import cn.hutool.core.date.LocalDateTimeUtil; -import cn.hutool.core.date.SystemClock; -import cn.hutool.core.util.RandomUtil; import cn.hutool.crypto.SecureUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.POJONode; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; import com.qcloud.cos.auth.COSCredentials; import com.qcloud.cos.exception.CosClientException; -import com.qcloud.cos.exception.CosServiceException; import com.qcloud.cos.http.HttpMethodName; import com.qcloud.cos.http.HttpProtocol; import com.qcloud.cos.model.GeneratePresignedUrlRequest; @@ -37,8 +33,6 @@ import com.tencent.cloud.CosStsClient; import com.tencent.cloud.Response; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.joda.time.DateTime; -import org.joda.time.DateTimeUtils; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -48,10 +42,6 @@ import java.io.InputStream; import java.net.URL; import java.time.LocalDateTime; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoField; -import java.time.temporal.ChronoUnit; -import java.util.Base64; import java.util.Date; import java.util.Objects; import java.util.TreeMap; @@ -121,7 +111,11 @@ public class TencentOssUploadService implements UploadService { Date expirationDate = new Date(System.currentTimeMillis() + 30L * 60L * 1000L); req.setExpiration(expirationDate); URL url = client.generatePresignedUrl(req); - response.encodeRedirectURL(url.toString()); + try { + response.sendRedirect(url.toString()); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override @@ -146,8 +140,8 @@ public class TencentOssUploadService implements UploadService { client.deleteObject(oss.getBucket(), updateFileInfo.getFileName()); } - public TempCredential getTemplateCredential() { - TempCredential tempCredential; + public UpLoadOptions getTemplateCredential() { + UpLoadOptions options; FileUploadProperties.TencentOss oss = fileUploadProperties.getTencentOss(); TreeMap config = new TreeMap(); config.put("secretId", oss.getSecretId()); @@ -175,11 +169,11 @@ public class TencentOssUploadService implements UploadService { config.put("allowActions", allowActions); try { Response response = CosStsClient.getCredential(config); - tempCredential = new TempCredential(); - tempCredential.setSessionToken(response.credentials.sessionToken); - tempCredential.setTmpSecretKey(response.credentials.tmpSecretKey); - tempCredential.setTmpSecretId(response.credentials.tmpSecretId); - tempCredential.setExpiredTime(1800L); + options = new UpLoadOptions(); + options.setSessionToken(response.credentials.sessionToken); + options.setTmpSecretKey(response.credentials.tmpSecretKey); + options.setTmpSecretId(response.credentials.tmpSecretId); + options.setExpiredTime(1800L); } catch (IOException e) { throw new RuntimeException(e); } @@ -206,27 +200,29 @@ public class TencentOssUploadService implements UploadService { child.put("q-sign-algorithm", "sha1"); conditions.addPOJO(child); child = objectMapper.createObjectNode(); - child.put("q-ak", tempCredential.getTmpSecretId()); + child.put("q-ak", options.getTmpSecretId()); conditions.addPOJO(child); child = objectMapper.createObjectNode(); child.put("q-sign-time", keyTime); conditions.addPOJO(child); - formData.put("x-cos-security-token", tempCredential.getSessionToken()); + formData.put("x-cos-security-token", options.getSessionToken()); String policyText = JacksonUtil.toJson(root); formData.put("policy", Base64Encoder.encode(policyText)); formData.put("acl", "default"); formData.put("q-sign-algorithm", "sha1"); - formData.put("q-ak", tempCredential.getTmpSecretId()); + formData.put("q-ak", options.getTmpSecretId()); formData.put("q-key-time", keyTime); - String signKey = SecureUtil.hmacSha1(tempCredential.getTmpSecretKey()).digestHex(keyTime); + String signKey = SecureUtil.hmacSha1(options.getTmpSecretKey()).digestHex(keyTime); String stringToSign = SecureUtil.sha1().digestHex(policyText); String signature = SecureUtil.hmacSha1(signKey).digestHex(stringToSign); formData.put("q-signature", signature); log.info("signKey:{},stringToSign:{},signature:{}", signKey, stringToSign, signature); - tempCredential.setFormData(formData); - tempCredential.setUploadUrl("https://" + oss.getBucket() + ".cos.ap-beijing.myqcloud.com"); - return tempCredential; + options.setFormData(formData); + options.setUploadUrl("https://" + oss.getBucket() + ".cos.ap-beijing.myqcloud.com"); + + + return options; } protected void doInit() { @@ -245,7 +241,7 @@ public class TencentOssUploadService implements UploadService { transferManager = new TransferManager(client, threadPool); TransferManagerConfiguration transferManagerConfiguration = new TransferManagerConfiguration(); transferManagerConfiguration.setMultipartUploadThreshold(5 * 1024 * 1024); - transferManagerConfiguration.setMinimumUploadPartSize(1 * 1024 * 1024); + transferManagerConfiguration.setMinimumUploadPartSize(1024 * 1024); transferManager.setConfiguration(transferManagerConfiguration); } -- Gitee From 9013ce0959d565845bf7ec77a493a4a05d5e5172 Mon Sep 17 00:00:00 2001 From: xucun Date: Tue, 22 Aug 2023 19:30:43 +0800 Subject: [PATCH 32/35] =?UTF-8?q?:pencil:=20=E8=A1=A5=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootx-start/src/main/resources/application-dev.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 0de0c525..6bf63d05 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -224,6 +224,17 @@ bootx: access-secret: password # 存储桶 需要至少三位 bucket: bootx + tencent-oss: + # 标识 + secret-id: '' + # 密钥 + secret-key: '' + # 地域 + region: '' + # 会话token + session-token: + # 存储桶名称 + bucket: bootx # 数据权限 data-perm: field-decrypt-key: "UCrtxSCwYZNCIlav" -- Gitee From 6e951fc5c0e7c82ecd9f5554594405d1072e7afb Mon Sep 17 00:00:00 2001 From: Fnckerpoi <38403438+Fnckerpoi@users.noreply.github.com> Date: Wed, 23 Aug 2023 08:57:48 +0800 Subject: [PATCH 33/35] =?UTF-8?q?goview=E6=9C=8D=E5=8A=A1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=85=B3=E8=81=94=E9=85=8D=E7=BD=AE=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualization/core/service/ProjectInfoService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java index b4483ecf..85b7e940 100644 --- a/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java +++ b/bootx-services/service-visualization/src/main/java/cn/bootx/platform/visualization/core/service/ProjectInfoService.java @@ -2,6 +2,7 @@ package cn.bootx.platform.visualization.core.service; import cn.bootx.platform.common.core.exception.BizException; import cn.bootx.platform.common.core.exception.DataNotExistException; +import cn.bootx.platform.common.core.function.ParamService; import cn.bootx.platform.common.core.rest.PageResult; import cn.bootx.platform.common.core.rest.param.PageParam; import cn.bootx.platform.common.mybatisplus.util.MpUtil; @@ -51,6 +52,8 @@ public class ProjectInfoService { private final ProjectInfoPublishManager publishManager; + private final ParamService paramService; + /** * 获取文件上传oss信息 */ @@ -265,7 +268,12 @@ public class ProjectInfoService { * GoView服务地址 */ public String getGoViewUrl() { - return visualizationProperties.getGoViewUrl(); + String serverUrl = paramService.getValue("FileServerUrl"); + if (StrUtil.isBlank(serverUrl)) { + serverUrl = visualizationProperties.getGoViewUrl(); + } + return serverUrl; + } } -- Gitee From 5f6e0ac4c0dc53464a9fa5ec1055ae0c29966bfa Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Thu, 24 Aug 2023 09:45:21 +0800 Subject: [PATCH 34/35] =?UTF-8?q?build=20=E6=B3=A8=E9=87=8A=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=BB=BA=E8=A1=A8=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 2 +- .../bootx/platform/starter/file/entity/JdbcFileData.java | 2 +- .../platform/baseapi/core/chinaword/entity/ChinaWord.java | 2 +- .../baseapi/core/template/entity/GeneralTemplate.java | 2 +- .../cn/bootx/platform/iam/core/client/entity/Client.java | 7 +++---- .../core/security/login/entity/LoginSecurityConfig.java | 2 +- .../iam/core/security/password/entity/PasswordHistory.java | 2 +- .../miniapp/core/feedback/entity/FeedbackInfo.java | 2 +- .../platform/notice/core/sms/entity/SmsChannelConfig.java | 2 +- docker-compose.yml | 6 +++--- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index f0526639..ccb86be2 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -9,9 +9,9 @@ - x 用户批量重置密码 - x 代码生成模板添加批量操作相关 - x 支持IpV6地址的记录 -## 1.3.5 - 参数配置支持只允许后端访问 - 键值对管理增加可视化界面管理 +## 1.3.5 - 审计日志增加定时删除和一键清除超期日志功能 - 文件管理支持配置所属上传类型、是否被使用过、是否登陆后才可以访问 ## 1.3.x、1.4.x diff --git a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java index aa04aa3b..9959008f 100644 --- a/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java +++ b/bootx-common-starters/common-starter-file/src/main/java/cn/bootx/platform/starter/file/entity/JdbcFileData.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) -@DbTable(comment = "上传文件数据") +//@DbTable(comment = "上传文件数据") @TableName("starter_file_data") public class JdbcFileData extends MpIdEntity { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java index 749bf7d1..5f939c9a 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/chinaword/entity/ChinaWord.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "敏感词") +//@DbTable(comment = "敏感词") @Accessors(chain = true) @TableName(value = "base_china_word",autoResultMap = true) public class ChinaWord extends MpDelEntity implements EntityBaseFunction { diff --git a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java index d1ff1984..96754c0c 100644 --- a/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java +++ b/bootx-services/service-baseapi/src/main/java/cn/bootx/platform/baseapi/core/template/entity/GeneralTemplate.java @@ -21,7 +21,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "通用模板管理") +//@DbTable(comment = "通用模板管理") @Accessors(chain = true) @TableName("base_general_template") public class GeneralTemplate extends MpBaseEntity implements EntityBaseFunction { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java index 69d2d316..3f3ba7a7 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/client/entity/Client.java @@ -1,12 +1,11 @@ package cn.bootx.platform.iam.core.client.entity; import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbTable; import cn.bootx.platform.common.core.function.EntityBaseFunction; -import cn.bootx.platform.iam.core.client.convert.ClientConvert; -import cn.bootx.platform.iam.param.client.ClientParam; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.platform.iam.core.client.convert.ClientConvert; import cn.bootx.platform.iam.dto.client.ClientDto; +import cn.bootx.platform.iam.param.client.ClientParam; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; @@ -27,7 +26,7 @@ import java.util.stream.Collectors; */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "认证终端",isAppend = true) +//@DbTable(comment = "认证终端",isAppend = true) @TableName("iam_client") @Accessors(chain = true) public class Client extends MpBaseEntity implements EntityBaseFunction { diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java index 2fd8673b..377fef85 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; * @author xxm * @since 2023/8/17 */ -@DbTable(comment = "登录安全策略") +//@DbTable(comment = "登录安全策略") @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordHistory.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordHistory.java index 55922f7a..6a85fb65 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordHistory.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordHistory.java @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "密码历史") +//@DbTable(comment = "密码历史") @Accessors(chain = true) @TableName("iam_password_history") public class PasswordHistory extends MpCreateEntity { diff --git a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java index 1c75039c..7d7d2e35 100644 --- a/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java +++ b/bootx-services/service-miniapp/src/main/java/cn/bootx/platform/miniapp/core/feedback/entity/FeedbackInfo.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Data @Accessors(chain = true) -@DbTable(comment = "用户反馈信息") +//@DbTable(comment = "用户反馈信息") @TableName("miniapp_feedback_info") public class FeedbackInfo extends MpBaseEntity implements EntityBaseFunction { diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java index aeb73cf7..c6a792e7 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/sms/entity/SmsChannelConfig.java @@ -26,7 +26,7 @@ import static com.baomidou.mybatisplus.annotation.FieldStrategy.IGNORED; */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "短信渠道配置") +//@DbTable(comment = "短信渠道配置") @Accessors(chain = true) @TableName("notice_sms_channel_config") public class SmsChannelConfig extends MpBaseEntity implements EntityBaseFunction { diff --git a/docker-compose.yml b/docker-compose.yml index bef10725..f5bbce79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,6 @@ services: - JAVA_OPTS= -Xms256m -Xmx1G -Dlogging.config=./logback-spring.xml volumes: # 读取外部化配置文件(根据实际服务器环境做修改), 宿主机目录:容器目录 - - /data/logs/dax-start:/logs # 日志 - - /root/dax-pay/application-dev.yml:/application-dev.yml # 配置 - - /root/dax-pay/logback-spring.xml:/logback-spring.xml # 日志框架 + - /data/logs/:/logs # 日志 + - /root/bootx-start/application-dev.yml:/application-dev.yml # 配置 + - /root/dax-paydax-pay/logback-spring.xml:/logback-spring.xml # 日志框架 -- Gitee From 019643b9662c7cca27423c39b334ccab26648ffd Mon Sep 17 00:00:00 2001 From: xxm1995 Date: Sun, 27 Aug 2023 14:36:47 +0800 Subject: [PATCH 35/35] =?UTF-8?q?build=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- _config/sql/bootx-platform.sql | 108 +++++++++++++----- _doc/ChangeLog.md | 13 +++ bootx-common-core/pom.xml | 2 +- .../common-starter-audit-log/pom.xml | 2 +- .../common-starter-auth/pom.xml | 2 +- .../common-starter-code-gen/pom.xml | 2 +- .../common-starter-data-perm/pom.xml | 2 +- .../common-starter-dingtalk/pom.xml | 2 +- .../common-starter-file/pom.xml | 2 +- .../common-starter-monitor/pom.xml | 2 +- .../common-starter-quartz/pom.xml | 2 +- .../common-starter-wechat/pom.xml | 2 +- .../common-starter-wecom/pom.xml | 2 +- bootx-common-starters/pom.xml | 2 +- bootx-commons/common-cache/pom.xml | 2 +- bootx-commons/common-data-translate/pom.xml | 2 +- bootx-commons/common-eventer/pom.xml | 2 +- .../common-exception-handler/pom.xml | 2 +- bootx-commons/common-header-holder/pom.xml | 2 +- bootx-commons/common-idempotency/pom.xml | 2 +- bootx-commons/common-jackson/pom.xml | 2 +- bootx-commons/common-log/pom.xml | 2 +- bootx-commons/common-mongo/pom.xml | 2 +- bootx-commons/common-mybatis-plus/pom.xml | 2 +- bootx-commons/common-rabbitmq/pom.xml | 2 +- bootx-commons/common-redis-client/pom.xml | 2 +- bootx-commons/common-sequence/pom.xml | 2 +- bootx-commons/common-spring/pom.xml | 2 +- bootx-commons/common-super-query/pom.xml | 2 +- bootx-commons/common-swagger/pom.xml | 2 +- bootx-commons/common-websocket/pom.xml | 2 +- bootx-commons/common-xxl-job/pom.xml | 2 +- bootx-commons/pom.xml | 2 +- bootx-demo/pom.xml | 2 +- bootx-services/pom.xml | 2 +- bootx-services/service-baseapi/pom.xml | 2 +- bootx-services/service-iam/pom.xml | 2 +- .../login/entity/LoginSecurityConfig.java | 12 -- .../entity/PasswordSecurityConfig.java | 13 ++- bootx-services/service-miniapp/pom.xml | 2 +- bootx-services/service-notice/pom.xml | 2 +- .../dingtalk/entity/msg/DingVoiceMsg.java | 2 +- bootx-services/service-platform/pom.xml | 2 +- bootx-services/service-visualization/pom.xml | 2 +- bootx-start/pom.xml | 2 +- .../src/main/resources/application-dev.yml | 3 +- pom.xml | 4 +- 48 files changed, 150 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 33775ca8..ceede72a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Bootx-Platform (v1.3.3-园博园) +# Bootx-Platform (v1.3.4-园博园)

star - Build Status + Build Status Build Status Downloads diff --git a/_config/sql/bootx-platform.sql b/_config/sql/bootx-platform.sql index 73508a3a..a165f540 100644 --- a/_config/sql/bootx-platform.sql +++ b/_config/sql/bootx-platform.sql @@ -6,7 +6,7 @@ Target Server Type : MySQL File Encoding : 65001 - Date: 08/08/2023 15:09:13 + Date: 27/08/2023 13:46:57 */ SET NAMES utf8mb4; @@ -3012,6 +3012,29 @@ INSERT INTO `base_area` VALUES ('659009', '昆玉市', '6590'); INSERT INTO `base_area` VALUES ('659010', '胡杨河市', '6590'); INSERT INTO `base_area` VALUES ('659011', '新星市', '6590'); +-- ---------------------------- +-- Table structure for base_china_word +-- ---------------------------- +DROP TABLE IF EXISTS `base_china_word`; +CREATE TABLE `base_china_word` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `word` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '敏感词', + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '分类', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '描述', + `enable` bit(1) NULL DEFAULT NULL COMMENT '是否启用', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `white` bit(1) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '敏感词' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of base_china_word +-- ---------------------------- + -- ---------------------------- -- Table structure for base_city -- ---------------------------- @@ -3407,7 +3430,9 @@ INSERT INTO `base_dict` VALUES (1561003021674987520, 'SiteMessageReceive', '消 INSERT INTO `base_dict` VALUES (1561003189111603200, 'SiteMessageState', '消息发布状态', b'1', '站内信', '站内信消息发布状态', 1399985191002447872, '2022-08-20 22:52:17', 1399985191002447872, '2022-08-20 22:52:17', 0, 0); INSERT INTO `base_dict` VALUES (1589527951317389312, 'DataScopePerm', '数据范围权限', b'1', '系统属性', '数据范围权限', 1414143554414059520, '2022-11-07 15:59:30', 1399985191002447872, '2022-12-09 22:09:25', 0, 3); INSERT INTO `base_dict` VALUES (1633393287952257024, 'DatabaseType', '数据库类型', b'1', '开发', '数据库类型', 1414143554414059520, '2023-03-08 17:04:41', 1414143554414059520, '2023-03-08 17:04:41', 0, 0); -INSERT INTO `base_dict` VALUES (1688742690398617600, 'smsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-08 10:43:27', 0, 0); +INSERT INTO `base_dict` VALUES (1688742690398617600, 'SmsChannel', '短信渠道商', b'1', '消息服务', '短信渠道商', 1414143554414059520, '2023-08-08 10:43:27', 1414143554414059520, '2023-08-12 20:24:03', 0, 1); +INSERT INTO `base_dict` VALUES (1690338321769918464, 'GeneralTemplateUseType', '通用模板类型', b'1', '系统属性', '通用模板类型', 1414143554414059520, '2023-08-12 20:23:56', 1414143554414059520, '2023-08-12 20:24:22', 0, 1); +INSERT INTO `base_dict` VALUES (1690338545284378624, 'GeneralTemplateState', '通用模板状态', b'1', '系统属性', '通用模板状态', 1414143554414059520, '2023-08-12 20:24:49', 1414143554414059520, '2023-08-12 20:24:49', 0, 0); -- ---------------------------- -- Table structure for base_dict_item @@ -3495,16 +3520,20 @@ INSERT INTO `base_dict_item` VALUES (1589528423956729856, 1589527951317389312, ' INSERT INTO `base_dict_item` VALUES (1633403429028536320, 1633393287952257024, 'DatabaseType', 'mysql', 'MySQL', b'1', 1.00, '', 1414143554414059520, '2023-03-08 17:44:59', 1414143554414059520, '2023-03-08 17:44:59', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403459470794752, 1633393287952257024, 'DatabaseType', 'oracle', 'Oracle', b'1', 2.00, '', 1414143554414059520, '2023-03-08 17:45:07', 1414143554414059520, '2023-03-08 17:45:07', 0, 0); INSERT INTO `base_dict_item` VALUES (1633403498695925760, 1633393287952257024, 'DatabaseType', 'mssql', 'SQLServer', b'1', 3.00, '', 1414143554414059520, '2023-03-08 17:45:16', 1414143554414059520, '2023-03-08 17:45:16', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'smsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'smsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'smsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'smsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'smsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'smsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'smsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'smsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'smsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); -INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'smsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742732891111424, 1688742690398617600, 'SmsChannel', 'alibaba', '阿里云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:38', 1414143554414059520, '2023-08-08 10:43:38', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742768479780864, 1688742690398617600, 'SmsChannel', 'huawei', '华为云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:46', 1414143554414059520, '2023-08-08 10:43:46', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742808027873280, 1688742690398617600, 'SmsChannel', 'yunpian', '云片', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:43:55', 1414143554414059520, '2023-08-08 10:43:56', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742840626003968, 1688742690398617600, 'SmsChannel', 'tencent', '腾讯云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:03', 1414143554414059520, '2023-08-08 10:44:03', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742872506908672, 1688742690398617600, 'SmsChannel', 'uni_sms', '合一短信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:11', 1414143554414059520, '2023-08-08 10:44:11', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742905553829888, 1688742690398617600, 'SmsChannel', 'jd_cloud', '京东云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:19', 1414143554414059520, '2023-08-08 10:44:19', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742954715267072, 1688742690398617600, 'SmsChannel', 'cloopen', '容联云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:30', 1414143554414059520, '2023-08-08 10:44:30', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688742990446542848, 1688742690398617600, 'SmsChannel', 'emay', '亿美软通', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:39', 1414143554414059520, '2023-08-08 10:44:39', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743032297308160, 1688742690398617600, 'SmsChannel', 'ctyun', '天翼云', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:49', 1414143554414059520, '2023-08-08 10:44:49', 0, 0); +INSERT INTO `base_dict_item` VALUES (1688743065205817344, 1688742690398617600, 'SmsChannel', 'netease', '网易云信', b'1', 0.00, '', 1414143554414059520, '2023-08-08 10:44:57', 1414143554414059520, '2023-08-08 10:44:57', 0, 0); +INSERT INTO `base_dict_item` VALUES (1690338619024437248, 1690338321769918464, 'GeneralTemplateUseType', 'import', '导入', b'1', 0.00, '', 1414143554414059520, '2023-08-12 20:25:06', 1414143554414059520, '2023-08-12 20:25:06', 0, 0); +INSERT INTO `base_dict_item` VALUES (1690338653442895872, 1690338321769918464, 'GeneralTemplateUseType', 'export', '导出', b'1', 0.00, '', 1414143554414059520, '2023-08-12 20:25:15', 1414143554414059520, '2023-08-12 20:25:15', 0, 0); +INSERT INTO `base_dict_item` VALUES (1690338707129987072, 1690338545284378624, 'GeneralTemplateState', 'enable', '启用', b'1', 0.00, '', 1414143554414059520, '2023-08-12 20:25:27', 1414143554414059520, '2023-08-12 20:25:27', 0, 0); +INSERT INTO `base_dict_item` VALUES (1690338748032839680, 1690338545284378624, 'GeneralTemplateState', 'disable', '停用', b'1', 0.00, '', 1414143554414059520, '2023-08-12 20:25:37', 1414143554414059520, '2023-08-12 20:25:37', 0, 0); -- ---------------------------- -- Table structure for base_dynamic_data_source @@ -3560,6 +3589,33 @@ CREATE TABLE `base_dynamic_form` ( INSERT INTO `base_dynamic_form` VALUES (1552656018381422592, '测试表单', 'test', '{\"list\":[{\"type\":\"input\",\"label\":\"输入框\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":true,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"aa\",\"key\":\"input_1659059676533\",\"help\":\"测试\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"textarea\",\"label\":\"文本框\",\"options\":{\"width\":\"100%\",\"minRows\":4,\"maxRows\":6,\"maxLength\":null,\"defaultValue\":\"\",\"clearable\":true,\"hidden\":false,\"disabled\":false,\"placeholder\":\"请输入\"},\"model\":\"bb\",\"key\":\"textarea_1659020414125\",\"help\":\"\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"slider\",\"label\":\"滑动输入条\",\"options\":{\"width\":\"100%\",\"defaultValue\":34,\"disabled\":false,\"hidden\":false,\"min\":0,\"max\":100,\"step\":1,\"showInput\":false},\"model\":\"cc\",\"key\":\"slider_1659020433092\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]}],\"config\":{\"layout\":\"horizontal\",\"labelCol\":{\"xs\":4,\"sm\":4,\"md\":4,\"lg\":4,\"xl\":4,\"xxl\":4},\"labelWidth\":100,\"labelLayout\":\"flex\",\"wrapperCol\":{\"xs\":18,\"sm\":18,\"md\":18,\"lg\":18,\"xl\":18,\"xxl\":18},\"hideRequiredMark\":false,\"customStyle\":\"\"}}', '测试动态表单', 1399985191002447872, '2022-07-28 22:03:36', 1399985191002447872, '2022-07-29 09:55:22', 0, 7); INSERT INTO `base_dynamic_form` VALUES (1552656018381422593, '测试表单1', 'test1', '{\"list\":[{\"type\":\"input\",\"label\":\"申请人\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":true,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"apply_by\",\"key\":\"input_1659059676533\",\"help\":\"测试\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"input\",\"label\":\"请假天数\",\"options\":{\"type\":\"text\",\"width\":\"100%\",\"defaultValue\":\"\",\"placeholder\":\"请输入\",\"clearable\":false,\"maxLength\":null,\"addonBefore\":\"\",\"addonAfter\":\"\",\"hidden\":false,\"disabled\":false},\"model\":\"leave_days\",\"key\":\"input_1662106166142\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"textarea\",\"label\":\"备注\",\"options\":{\"width\":\"100%\",\"minRows\":4,\"maxRows\":6,\"maxLength\":null,\"defaultValue\":\"\",\"clearable\":true,\"hidden\":false,\"disabled\":false,\"placeholder\":\"请输入\"},\"model\":\"remark\",\"key\":\"textarea_1659020414125\",\"help\":\"\",\"rules\":[{\"required\":true,\"message\":\"必填项\"}]},{\"type\":\"switch\",\"label\":\"开关\",\"options\":{\"defaultValue\":false,\"hidden\":false,\"disabled\":false},\"model\":\"switch_1662108221389\",\"key\":\"switch_1662108221389\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"slider\",\"label\":\"滑动输入条\",\"options\":{\"width\":\"100%\",\"defaultValue\":34,\"disabled\":false,\"hidden\":false,\"min\":0,\"max\":100,\"step\":1,\"showInput\":false},\"model\":\"cc\",\"key\":\"slider_1659020433092\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]},{\"type\":\"table\",\"label\":\"表格布局\",\"trs\":[{\"tds\":[{\"colspan\":1,\"rowspan\":1,\"list\":[]},{\"colspan\":1,\"rowspan\":1,\"list\":[]}]},{\"tds\":[{\"colspan\":1,\"rowspan\":1,\"list\":[{\"type\":\"editor\",\"label\":\"富文本\",\"icon\":\"icon-LC_icon_edit_line_1\",\"list\":[],\"options\":{\"height\":300,\"placeholder\":\"请输入\",\"defaultValue\":\"\",\"chinesization\":true,\"hidden\":false,\"disabled\":false,\"showLabel\":false,\"width\":\"100%\"},\"model\":\"editor_1662106288134\",\"key\":\"editor_1662106288134\",\"help\":\"\",\"rules\":[{\"required\":false,\"message\":\"必填项\"}]}]},{\"colspan\":1,\"rowspan\":1,\"list\":[]}]}],\"options\":{\"width\":\"100%\",\"bordered\":true,\"bright\":false,\"small\":true,\"customStyle\":\"\"},\"key\":\"table_1662106283652\"}],\"config\":{\"layout\":\"vertical\",\"labelCol\":{\"xs\":6,\"sm\":6,\"md\":6,\"lg\":6,\"xl\":6,\"xxl\":6},\"labelWidth\":100,\"labelLayout\":\"Grid\",\"wrapperCol\":{\"xs\":18,\"sm\":18,\"md\":18,\"lg\":18,\"xl\":18,\"xxl\":18},\"hideRequiredMark\":false,\"customStyle\":\"\"}}', '测试动态表单', 1399985191002447872, '2022-07-28 22:03:36', 1414143554414059520, '2022-09-02 16:44:01', 0, 12); +-- ---------------------------- +-- Table structure for base_general_template +-- ---------------------------- +DROP TABLE IF EXISTS `base_general_template`; +CREATE TABLE `base_general_template` ( + `id` bigint(20) NOT NULL COMMENT '主键', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模板名称', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模板代码', + `use_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '使用类型(导入/导出)', + `file_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模板类型', + `file_suffix` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模板后缀名', + `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '状态', + `file_id` bigint(20) NULL DEFAULT NULL COMMENT '文件ID', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', + `creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者ID', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', + `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', + `version` int(11) NOT NULL COMMENT '乐观锁', + `deleted` bit(1) NOT NULL COMMENT '删除标志', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '通用模板管理' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of base_general_template +-- ---------------------------- + -- ---------------------------- -- Table structure for base_key_value -- ---------------------------- @@ -3607,11 +3663,10 @@ CREATE TABLE `base_param` ( -- Records of base_param -- ---------------------------- INSERT INTO `base_param` VALUES (1452842684284891136, '测试', 'test.v1', '123', 1, b'1', b'0', NULL, 1399985191002447872, '2021-10-26 11:41:03', 1399985191002447872, '2021-10-26 11:41:03', 0, 0); -INSERT INTO `base_param` VALUES (1500338438182789120, '结算台聚合支付请求地址', 'CashierAggregateUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1399985191002447872, '2022-03-06 13:12:13', 1399985191002447872, '2022-05-01 15:03:03', 0, 3); INSERT INTO `base_param` VALUES (1520668030248361984, '文件服务器地址', 'FileServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-01 15:34:46', 1399985191002447872, '2022-05-19 12:53:21', 0, 5); INSERT INTO `base_param` VALUES (1529281530059161600, 'websocket服务器地址', 'WebsocketServerUrl', 'ws://127.0.0.1:9999', 1, b'1', b'1', '', 1399985191002447872, '2022-05-25 10:01:44', 1399985191002447872, '2022-05-25 10:01:44', 0, 0); INSERT INTO `base_param` VALUES (1545765299880448000, '服务器地址', 'ServerUrl', 'http://127.0.0.1:9999', 1, b'1', b'1', '优先级高于配置文件内进行的配置', 1399985191002447872, '2022-07-09 21:42:21', 1414143554414059520, '2023-08-05 16:40:05', 0, 1); -INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2022-07-14 17:20:09', 0, 0); +INSERT INTO `base_param` VALUES (1547511252795912192, '微信jsapi支付回调服务地址', 'JsapiRedirectUrl', 'http://127.0.0.1/api/', 1, b'1', b'1', '用于微信扫码登录使用', 1414143554414059520, '2022-07-14 17:20:09', 1414143554414059520, '2023-08-18 15:49:21', 0, 1); -- ---------------------------- -- Table structure for base_province @@ -3863,7 +3918,7 @@ CREATE TABLE `iam_client` ( `last_modifier` bigint(20) NULL DEFAULT NULL COMMENT '最后修者ID', `last_modified_time` datetime NULL DEFAULT NULL COMMENT '最后修改时间', `version` int(11) NOT NULL COMMENT '乐观锁', - `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '删除标志', + `deleted` bit(1) NOT NULL COMMENT '删除标志', `default_endow` bit(1) NULL DEFAULT NULL COMMENT '新注册的用户是否默认赋予该终端', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '认证终端' ROW_FORMAT = DYNAMIC; @@ -4145,7 +4200,7 @@ INSERT INTO `iam_perm_menu` VALUES (1582302180999917568, 'adminv3', 158224992460 INSERT INTO `iam_perm_menu` VALUES (1582302542955769856, 'adminv3', 1582253011803262976, '用户管理', 'UserList', NULL, b'0', '', b'0', b'0', '/modules/system/user/UserList.vue', NULL, '/system/user/info', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:28:19', 1414143554414059520, '2022-10-18 17:28:19', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582302764129808384, 'adminv3', 1582253011803262976, '部门管理', 'DeptList', NULL, b'0', '', b'0', b'0', '/modules/system/dept/DeptList.vue', NULL, '/system/user/dept', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:29:11', 1414143554414059520, '2022-10-18 17:32:26', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582303143110340608, 'adminv3', 1582253152903843840, '数据字典', 'DictList', NULL, b'0', '', b'0', b'0', '/modules/system/dict/DictList.vue', NULL, '/system/config/dict', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:30:42', 1414143554414059520, '2022-10-18 17:30:42', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1582303290070364160, 'adminv3', 1582253152903843840, '定时任务', 'QuartzJobList', NULL, b'0', '', b'0', b'0', '/modules/system/quartz/QuartzJobList.vue', NULL, '/system/config/quartz', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:31:17', 1414143554414059520, '2022-10-18 17:32:12', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1582303290070364160, 'adminv3', 1582253152903843840, '定时任务', 'QuartzJobList', NULL, b'0', '', b'0', b'0', '/modules/baseapi/quartz/QuartzJobList.vue', NULL, '/system/config/quartz', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:31:17', 1414143554414059520, '2023-08-09 15:50:46', 2, 0); INSERT INTO `iam_perm_menu` VALUES (1582303447428067328, 'adminv3', 1582253152903843840, '系统参数', 'SystemParamList', NULL, b'0', '', b'0', b'0', '/modules/system/param/SystemParamList.vue', NULL, '/system/config/param', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-18 17:31:54', 1414143554414059520, '2022-10-19 23:14:16', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1582632873244172288, 'adminv3', 1582276341792985088, '文件管理', 'FileUploadList', NULL, b'0', '', b'0', b'0', '/modules/develop/file/FileUploadList.vue', NULL, '/develop/file', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:20:56', 1414143554414059520, '2022-10-19 15:20:56', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1582633196587261952, 'adminv3', 1582276341792985088, '代码生成', 'CodeGenList', NULL, b'0', '', b'0', b'0', '/modules/develop/codegen/CodeGenList.vue', NULL, '/develop/codegen', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-19 15:22:13', 1414143554414059520, '2022-10-19 15:23:17', 1, 0); @@ -4156,7 +4211,7 @@ INSERT INTO `iam_perm_menu` VALUES (1583075229563068416, 'adminv3', 158227587542 INSERT INTO `iam_perm_menu` VALUES (1583076217481043968, 'adminv3', 1583075229563068416, '登录日志', 'LoginLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/login/LoginLogList.vue', NULL, '/monitor/log/login', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:42:37', 1414143554414059520, '2022-10-20 20:43:36', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1583076424935514112, 'adminv3', 1583075229563068416, '操作日志', 'OperateLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/operate/OperateLogList.vue', NULL, '/monitor/log/operate', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:43:26', 1414143554414059520, '2022-10-20 20:43:26', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1583076670881112064, 'adminv3', 1583075229563068416, '数据版本日志', 'DataVersionLogList', NULL, b'0', '', b'0', b'0', '/modules/monitor/data/DataVersionLogList.vue', NULL, '/monitor/log/data', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:44:25', 1414143554414059520, '2022-10-20 20:44:25', 0, 0); -INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'0', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2022-11-21 15:04:13', 2, 0); +INSERT INTO `iam_perm_menu` VALUES (1583076878956339200, 'adminv3', 1582275875424129024, 'ELK日志', 'ELK', NULL, b'0', '', b'1', b'0', '', NULL, 'http://elk.dev.bootx.cn:5601/app/discover', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:15', 1414143554414059520, '2023-08-12 19:26:12', 3, 0); INSERT INTO `iam_perm_menu` VALUES (1583077015434797056, 'adminv3', 1582275875424129024, 'PlumeLog日志', 'PlumeLog', NULL, b'0', '', b'0', b'0', '', NULL, 'http://127.0.0.1:9999/plumelog/#/', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:45:47', 1414143554414059520, '2022-10-20 20:45:47', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1583077198772019200, 'adminv3', 1582275875424129024, '系统信息', 'SystemInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/system/SystemInfoMonitor.vue', NULL, '/monitor/sysinfo', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:46:31', 1414143554414059520, '2022-10-20 20:46:31', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1583077360827342848, 'adminv3', 1582275875424129024, 'Redis监控', 'RedisInfoMonitor', NULL, b'0', '', b'0', b'0', '/modules/monitor/redis/RedisInfoMonitor.vue', NULL, '/monitor/redis', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2022-10-20 20:47:10', 1414143554414059520, '2022-10-20 20:47:10', 0, 0); @@ -4193,6 +4248,8 @@ INSERT INTO `iam_perm_menu` VALUES (1635274568758435840, 'adminv3', 158227634179 INSERT INTO `iam_perm_menu` VALUES (1687369862646558720, 'adminv3', 1582275984849326080, '短信管理', 'Sms', NULL, b'0', '', b'0', b'0', 'Layout', NULL, '/notice/sms', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:48:20', 1414143554414059520, '2023-08-04 15:48:32', 1, 0); INSERT INTO `iam_perm_menu` VALUES (1687370142234669056, 'adminv3', 1687369862646558720, '短信配置', 'SmsChannelConfigList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/config/SmsChannelConfigList', NULL, '/notice/sms/config', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:26', 1414143554414059520, '2023-08-04 15:49:26', 0, 0); INSERT INTO `iam_perm_menu` VALUES (1687370277496778752, 'adminv3', 1687369862646558720, '短信模板', 'SmsTemplateList', NULL, b'0', '', b'0', b'0', '/modules/notice/sms/template/SmsTemplateList', NULL, '/notice/sms/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-04 15:49:59', 1414143554414059520, '2023-08-04 15:50:38', 1, 0); +INSERT INTO `iam_perm_menu` VALUES (1689181991598997504, 'adminv3', 1582253152903843840, '敏感词管理', 'ChinaWord', NULL, b'0', '', b'0', b'0', '/modules/baseapi/chianword/ChinaWordList.vue', NULL, '/system/config/chinaword', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-09 15:49:05', 1414143554414059520, '2023-08-09 15:49:05', 0, 0); +INSERT INTO `iam_perm_menu` VALUES (1690324070514782208, 'adminv3', 1582276341792985088, '通用模板', 'GeneralTemplateList', NULL, b'0', '', b'0', b'0', '/modules/develop/template/GeneralTemplateList', NULL, '/develop/template', '', 0, 1, NULL, b'1', b'0', b'0', b'0', NULL, 1414143554414059520, '2023-08-12 19:27:18', 1414143554414059520, '2023-08-12 19:31:26', 3, 0); -- ---------------------------- -- Table structure for iam_perm_path @@ -4345,8 +4402,8 @@ CREATE TABLE `iam_user_expand_info` ( -- ---------------------------- -- Records of iam_user_expand_info -- ---------------------------- -INSERT INTO `iam_user_expand_info` VALUES (1399985191002447872, 1, '1996-12-01', '1495331905770315776', '2022-10-29 08:44:52', '2022-11-02 09:59:06', b'0', '2022-06-19 21:25:00', 1, '2021-06-02 15:04:15', 0, '2022-11-02 09:59:06', 367, 0); -INSERT INTO `iam_user_expand_info` VALUES (1414143554414059520, 1, '2022-10-31', '1586953599627546624', '2022-11-02 21:32:23', '2022-11-02 21:33:21', b'0', NULL, 1, '2021-07-11 16:44:32', 0, '2022-11-02 21:33:21', 62, 0); +INSERT INTO `iam_user_expand_info` VALUES (1399985191002447872, 1, '1996-12-01', '1495331905770315776', '2022-11-02 09:59:06', '2023-08-21 13:24:32', b'0', '2022-06-19 21:25:00', 1, '2021-06-02 15:04:15', 0, '2023-08-21 13:24:32', 368, 0); +INSERT INTO `iam_user_expand_info` VALUES (1414143554414059520, 1, '2022-10-31', '1586953599627546624', '2023-08-21 13:06:47', '2023-08-21 13:23:26', b'0', NULL, 1, '2021-07-11 16:44:32', 0, '2023-08-21 13:23:26', 66, 0); INSERT INTO `iam_user_expand_info` VALUES (1435894470432456704, 1, NULL, NULL, '2022-09-16 16:48:16', '2022-09-17 17:20:58', b'0', '2022-06-29 00:39:23', 1399985191002447872, '2021-09-09 17:14:54', 0, '2022-09-17 17:20:58', 5, 0); INSERT INTO `iam_user_expand_info` VALUES (1435967884114194432, 1, NULL, NULL, NULL, '2022-05-31 15:59:42', b'0', NULL, 1414143554414059520, '2021-09-09 22:06:37', 0, '2022-05-31 15:59:42', 1, 0); INSERT INTO `iam_user_expand_info` VALUES (1477990832987361280, 1, NULL, NULL, NULL, NULL, b'0', NULL, 1399985191002447872, '2022-01-03 21:10:49', 1399985191002447872, '2022-01-03 21:10:49', 0, 0); @@ -4433,6 +4490,7 @@ CREATE TABLE `iam_user_third` ( -- ---------------------------- -- Records of iam_user_third -- ---------------------------- +INSERT INTO `iam_user_third` VALUES (1693285779222376448, 1414143554414059520, 'oAAyF68eYHdvi3lc_XGGDpzE7EWM', NULL, NULL, NULL, NULL, NULL, NULL, 1414143554414059520, '2023-08-20 23:36:04', 1414143554414059520, '2023-08-20 23:46:17', 1, 0); -- ---------------------------- -- Table structure for iam_user_third_info @@ -4455,10 +4513,6 @@ CREATE TABLE `iam_user_third_info` ( INDEX `pk_user_client`(`user_id`, `client_code`) USING BTREE COMMENT '用户id和终端code' ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户三方登录绑定详情' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of iam_user_third_info --- ---------------------------- - -- ---------------------------- -- Table structure for notice_mail_config -- ---------------------------- @@ -4797,9 +4851,6 @@ CREATE TABLE `qrtz_locks` ( PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of qrtz_locks --- ---------------------------- -- ---------------------------- -- Table structure for qrtz_paused_trigger_grps @@ -5006,9 +5057,6 @@ CREATE TABLE `starter_audit_login_log` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志' ROW_FORMAT = DYNAMIC; --- ---------------------------- --- Records of starter_audit_login_log --- ---------------------------- -- ---------------------------- -- Table structure for starter_audit_operate_log @@ -5086,7 +5134,7 @@ DROP TABLE IF EXISTS `starter_file_data`; CREATE TABLE `starter_file_data` ( `id` bigint(20) NOT NULL COMMENT '主键', `base64` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT 'base64方式存储', - `data` longblob NULL COMMENT 'base64方式存储', + `data` longblob NULL COMMENT '数据方式存储', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '上传文件数据' ROW_FORMAT = DYNAMIC; diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 051a20f3..15c460e5 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,4 +1,17 @@ # CHANGELOG + +## [v1.3.4] 一号线-园博园 +- 新增: 通用导入组件 +- 新增: 小程序端脚手架 +- 新增: 小程序后端对接相关配置 +- 新增: 敏感字管理和过滤功能 +- 新增: 适配腾讯云cos文件存储上传 +- 优化: 优化几种MP的类型转换器类 +- 优化: 用户批量重置密码 +- 优化: 代码生成模板添加批量操作相关 +- 优化: 支持IpV6地址的记录 +- 优化: Dockerfile相关配置 +- fix: 修复无法查看站内信的问题 ## [v1.3.3] 一号线-园博园 - 新增: 添加短信配置, 集成SMS4J, 支持分渠道配置 - 新增: 新版自定义表单集成(epic-designer尚处于测试版) diff --git a/bootx-common-core/pom.xml b/bootx-common-core/pom.xml index 7afde8db..c7d19e9f 100644 --- a/bootx-common-core/pom.xml +++ b/bootx-common-core/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-audit-log/pom.xml b/bootx-common-starters/common-starter-audit-log/pom.xml index 21233564..8ad0fff3 100644 --- a/bootx-common-starters/common-starter-audit-log/pom.xml +++ b/bootx-common-starters/common-starter-audit-log/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-auth/pom.xml b/bootx-common-starters/common-starter-auth/pom.xml index f408f0d8..fb3d8761 100644 --- a/bootx-common-starters/common-starter-auth/pom.xml +++ b/bootx-common-starters/common-starter-auth/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.3 + 1.3.4 4.0.0 common-starter-auth diff --git a/bootx-common-starters/common-starter-code-gen/pom.xml b/bootx-common-starters/common-starter-code-gen/pom.xml index 7a72e9f3..77f4bb09 100644 --- a/bootx-common-starters/common-starter-code-gen/pom.xml +++ b/bootx-common-starters/common-starter-code-gen/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-data-perm/pom.xml b/bootx-common-starters/common-starter-data-perm/pom.xml index 950a73b0..9d68ff76 100644 --- a/bootx-common-starters/common-starter-data-perm/pom.xml +++ b/bootx-common-starters/common-starter-data-perm/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-dingtalk/pom.xml b/bootx-common-starters/common-starter-dingtalk/pom.xml index 80cc29b9..ba0a3062 100644 --- a/bootx-common-starters/common-starter-dingtalk/pom.xml +++ b/bootx-common-starters/common-starter-dingtalk/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-file/pom.xml b/bootx-common-starters/common-starter-file/pom.xml index a8dd4aec..a914aabd 100644 --- a/bootx-common-starters/common-starter-file/pom.xml +++ b/bootx-common-starters/common-starter-file/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-monitor/pom.xml b/bootx-common-starters/common-starter-monitor/pom.xml index 72c247a7..0929ad32 100644 --- a/bootx-common-starters/common-starter-monitor/pom.xml +++ b/bootx-common-starters/common-starter-monitor/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 jar diff --git a/bootx-common-starters/common-starter-quartz/pom.xml b/bootx-common-starters/common-starter-quartz/pom.xml index c20f0927..fd2de439 100644 --- a/bootx-common-starters/common-starter-quartz/pom.xml +++ b/bootx-common-starters/common-starter-quartz/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-wechat/pom.xml b/bootx-common-starters/common-starter-wechat/pom.xml index 7ecc8b14..c1af83b6 100644 --- a/bootx-common-starters/common-starter-wechat/pom.xml +++ b/bootx-common-starters/common-starter-wechat/pom.xml @@ -5,7 +5,7 @@ bootx-common-starters cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-common-starters/common-starter-wecom/pom.xml b/bootx-common-starters/common-starter-wecom/pom.xml index 4e9bdb39..a84b05e0 100644 --- a/bootx-common-starters/common-starter-wecom/pom.xml +++ b/bootx-common-starters/common-starter-wecom/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-common-starters - 1.3.3 + 1.3.4 4.0.0 jar diff --git a/bootx-common-starters/pom.xml b/bootx-common-starters/pom.xml index 3b798843..2ba7b8de 100644 --- a/bootx-common-starters/pom.xml +++ b/bootx-common-starters/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-cache/pom.xml b/bootx-commons/common-cache/pom.xml index ad555584..f608a568 100644 --- a/bootx-commons/common-cache/pom.xml +++ b/bootx-commons/common-cache/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-data-translate/pom.xml b/bootx-commons/common-data-translate/pom.xml index ba406178..cd726fa5 100644 --- a/bootx-commons/common-data-translate/pom.xml +++ b/bootx-commons/common-data-translate/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-eventer/pom.xml b/bootx-commons/common-eventer/pom.xml index 4b095318..d54847f7 100644 --- a/bootx-commons/common-eventer/pom.xml +++ b/bootx-commons/common-eventer/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 common-eventer diff --git a/bootx-commons/common-exception-handler/pom.xml b/bootx-commons/common-exception-handler/pom.xml index 2adb989e..a50e3eda 100644 --- a/bootx-commons/common-exception-handler/pom.xml +++ b/bootx-commons/common-exception-handler/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 common-exception-handler diff --git a/bootx-commons/common-header-holder/pom.xml b/bootx-commons/common-header-holder/pom.xml index 310e66e9..63d0c6bd 100644 --- a/bootx-commons/common-header-holder/pom.xml +++ b/bootx-commons/common-header-holder/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-idempotency/pom.xml b/bootx-commons/common-idempotency/pom.xml index d9d3745a..6fde82c3 100644 --- a/bootx-commons/common-idempotency/pom.xml +++ b/bootx-commons/common-idempotency/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-jackson/pom.xml b/bootx-commons/common-jackson/pom.xml index 51b83427..17ad010d 100644 --- a/bootx-commons/common-jackson/pom.xml +++ b/bootx-commons/common-jackson/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-log/pom.xml b/bootx-commons/common-log/pom.xml index 96da106d..29fd3871 100644 --- a/bootx-commons/common-log/pom.xml +++ b/bootx-commons/common-log/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-mongo/pom.xml b/bootx-commons/common-mongo/pom.xml index 293551c9..5591b7dc 100644 --- a/bootx-commons/common-mongo/pom.xml +++ b/bootx-commons/common-mongo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-commons - 1.3.3 + 1.3.4 4.0.0 common-mongo diff --git a/bootx-commons/common-mybatis-plus/pom.xml b/bootx-commons/common-mybatis-plus/pom.xml index 06f249b0..36fa6338 100644 --- a/bootx-commons/common-mybatis-plus/pom.xml +++ b/bootx-commons/common-mybatis-plus/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-rabbitmq/pom.xml b/bootx-commons/common-rabbitmq/pom.xml index 9c49e2f1..90a9b739 100644 --- a/bootx-commons/common-rabbitmq/pom.xml +++ b/bootx-commons/common-rabbitmq/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-redis-client/pom.xml b/bootx-commons/common-redis-client/pom.xml index f76c6573..298255a4 100644 --- a/bootx-commons/common-redis-client/pom.xml +++ b/bootx-commons/common-redis-client/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-sequence/pom.xml b/bootx-commons/common-sequence/pom.xml index 085ba398..d9ae7b97 100644 --- a/bootx-commons/common-sequence/pom.xml +++ b/bootx-commons/common-sequence/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-spring/pom.xml b/bootx-commons/common-spring/pom.xml index 4432d11a..96e96c51 100644 --- a/bootx-commons/common-spring/pom.xml +++ b/bootx-commons/common-spring/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-super-query/pom.xml b/bootx-commons/common-super-query/pom.xml index 581ed7b6..fbaa8c01 100644 --- a/bootx-commons/common-super-query/pom.xml +++ b/bootx-commons/common-super-query/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-swagger/pom.xml b/bootx-commons/common-swagger/pom.xml index c8ff6d93..96efbf55 100644 --- a/bootx-commons/common-swagger/pom.xml +++ b/bootx-commons/common-swagger/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-websocket/pom.xml b/bootx-commons/common-websocket/pom.xml index c44c1107..084183a3 100644 --- a/bootx-commons/common-websocket/pom.xml +++ b/bootx-commons/common-websocket/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/common-xxl-job/pom.xml b/bootx-commons/common-xxl-job/pom.xml index b065daa2..c5172b51 100644 --- a/bootx-commons/common-xxl-job/pom.xml +++ b/bootx-commons/common-xxl-job/pom.xml @@ -5,7 +5,7 @@ bootx-commons cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-commons/pom.xml b/bootx-commons/pom.xml index 669f4411..b1e6eb56 100644 --- a/bootx-commons/pom.xml +++ b/bootx-commons/pom.xml @@ -7,7 +7,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 bootx-commons diff --git a/bootx-demo/pom.xml b/bootx-demo/pom.xml index a2b09b39..9b7c1ea5 100644 --- a/bootx-demo/pom.xml +++ b/bootx-demo/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-services/pom.xml b/bootx-services/pom.xml index 2ed39715..fe2025a7 100644 --- a/bootx-services/pom.xml +++ b/bootx-services/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-services/service-baseapi/pom.xml b/bootx-services/service-baseapi/pom.xml index 1b354bdc..d46d02bc 100644 --- a/bootx-services/service-baseapi/pom.xml +++ b/bootx-services/service-baseapi/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-services/service-iam/pom.xml b/bootx-services/service-iam/pom.xml index 2b4c760c..e31de0c6 100644 --- a/bootx-services/service-iam/pom.xml +++ b/bootx-services/service-iam/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java index 377fef85..46133e35 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/login/entity/LoginSecurityConfig.java @@ -2,7 +2,6 @@ package cn.bootx.platform.iam.core.security.login.entity; import cn.bootx.mybatis.table.modify.annotation.DbColumn; import cn.bootx.mybatis.table.modify.annotation.DbComment; -import cn.bootx.mybatis.table.modify.annotation.DbTable; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -25,17 +24,6 @@ public class LoginSecurityConfig extends MpBaseEntity { @DbComment("关联终端ID") private Long clientId; - /** 最大密码错误数 */ - @DbComment("最大密码错误数") - private Integer maxPwdErrorCount; - - /** 密码错误锁定时间(秒) */ - @DbComment("密码错误锁定时间(秒)") - private Integer errorLockTime; - - /** 强制修改初始密码 */ - private Boolean requireChangePwd; - /** 修改密码是否需要重新登录 */ @DbComment("修改密码是否需要重新登录") private Boolean requireLoginChangePwd; diff --git a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordSecurityConfig.java b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordSecurityConfig.java index 1a46c930..f3013833 100644 --- a/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordSecurityConfig.java +++ b/bootx-services/service-iam/src/main/java/cn/bootx/platform/iam/core/security/password/entity/PasswordSecurityConfig.java @@ -19,6 +19,17 @@ import lombok.experimental.Accessors; @TableName("iam_password_security_config") public class PasswordSecurityConfig extends MpBaseEntity { + /** 最大密码错误数 */ + @DbComment("最大密码错误数") + private Integer maxPwdErrorCount; + + /** 密码错误锁定时间(秒) */ + @DbComment("密码错误锁定时间(秒)") + private Integer errorLockTime; + + /** 强制修改初始密码 */ + private Boolean requireChangePwd; + /** 用户默认密码 */ private String defaultPassword; @@ -31,7 +42,7 @@ public class PasswordSecurityConfig extends MpBaseEntity { /** 与登录名相同 */ private Boolean sameAsLoginName; - /** 不能与多少次近期密码相同 */ + /** 不能与近期多少次密码相同 */ private Integer recentPassword; /** */ diff --git a/bootx-services/service-miniapp/pom.xml b/bootx-services/service-miniapp/pom.xml index d93bb8f1..e81da96e 100644 --- a/bootx-services/service-miniapp/pom.xml +++ b/bootx-services/service-miniapp/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-services - 1.3.3 + 1.3.4 service-miniapp diff --git a/bootx-services/service-notice/pom.xml b/bootx-services/service-notice/pom.xml index 6fe77931..c5539b0a 100644 --- a/bootx-services/service-notice/pom.xml +++ b/bootx-services/service-notice/pom.xml @@ -5,7 +5,7 @@ bootx-services cn.bootx.platform - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java index 860b8df6..879b95cb 100644 --- a/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java +++ b/bootx-services/service-notice/src/main/java/cn/bootx/platform/notice/core/dingtalk/entity/msg/DingVoiceMsg.java @@ -18,7 +18,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @AllArgsConstructor @NoArgsConstructor -@Schema(title = "声音消息") +@Schema(title = "声音工作通知消息") public class DingVoiceMsg implements DingMsg { @Schema(description = "媒体文件id") diff --git a/bootx-services/service-platform/pom.xml b/bootx-services/service-platform/pom.xml index f588cc7a..b758429a 100644 --- a/bootx-services/service-platform/pom.xml +++ b/bootx-services/service-platform/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-services - 1.3.3 + 1.3.4 service-platform diff --git a/bootx-services/service-visualization/pom.xml b/bootx-services/service-visualization/pom.xml index da1f1946..b6bb2d2e 100644 --- a/bootx-services/service-visualization/pom.xml +++ b/bootx-services/service-visualization/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-services - 1.3.3 + 1.3.4 4.0.0 diff --git a/bootx-start/pom.xml b/bootx-start/pom.xml index b451e350..43edb808 100644 --- a/bootx-start/pom.xml +++ b/bootx-start/pom.xml @@ -5,7 +5,7 @@ cn.bootx.platform bootx-platform-parent - 1.3.3 + 1.3.4 4.0.0 bootx-start diff --git a/bootx-start/src/main/resources/application-dev.yml b/bootx-start/src/main/resources/application-dev.yml index 6bf63d05..c010075a 100644 --- a/bootx-start/src/main/resources/application-dev.yml +++ b/bootx-start/src/main/resources/application-dev.yml @@ -93,7 +93,7 @@ bootx: swagger: enabled: true author: bootx - version: 1.3.3 + version: 1.3.4 title: bootx开发平台单体版 description: bootx-platform开发平台单体版 # basic认证 @@ -145,6 +145,7 @@ bootx: ding-talk: app-key: ?? app-secret: ?? + agent-id: 1001 #微信(公众平台) wechat: app-id: ?? diff --git a/pom.xml b/pom.xml index ab4d2626..fb28fecb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cn.bootx.platform bootx-platform-parent pom - 1.3.3 + 1.3.4 bootx-platform @@ -75,7 +75,7 @@ 1.8 - 1.3.3 + 1.3.4 5.8.20 6.4.4 -- Gitee