From d9c263dd99625c8b2b93971776571af6c0f42673 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 23 Oct 2023 13:02:50 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89mq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/core/stream/AbstractStreamMessageListener.java | 2 ++ .../module/infra/api/logger/ApiAccessLogApiImpl.java | 11 +++++++---- .../module/infra/api/logger/ApiErrorLogApiImpl.java | 11 +++++++---- .../win/module/infra/api/trends/TrendsApiImpl.java | 11 +++++++---- .../controller/notify/NotifyMessageController.java | 2 ++ win-server/src/main/resources/application.yaml | 2 +- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java index 52a6feb4..12a21104 100644 --- a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java +++ b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java @@ -63,6 +63,8 @@ public abstract class AbstractStreamMessageListener getUnreadNotifyMessageCount() { return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId())); } diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index fb8fb185..d89f0b25 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -139,7 +139,7 @@ win: pubsub: enable: false # 是否开启 Redis pubsub 广播消费，默认为 true。这里设置成 false，可以按需开启 stream: - enable: true # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 + enable: false # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 tenant: # 多租户相关配置项 enable: true ignore-urls: From af5a805d0a7244f61f56db76dedde85049f3af84 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 23 Oct 2023 13:40:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?shardingsphere=E5=A2=9E=E5=8A=A0=E5=88=B020?= =?UTF-8?q?30=E5=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/META-INF/spring.factories | 1 + ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 3 ++- win-server/src/main/resources/application-dev.yaml | 3 +-- win-server/src/main/resources/application-prod.yaml | 3 +-- win-server/src/main/resources/application-test.yaml | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories index 4c2b1ed2..8e472fcd 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,3 @@ org.springframework.boot.env.EnvironmentPostProcessor=\ com.win.framework.mybatis.config.IdTypeEnvironmentPostProcessor + diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 68f8a104..9c8f0dd1 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ com.win.framework.datasource.config.WinDataSourceAutoConfiguration -com.win.framework.mybatis.config.WinMybatisAutoConfiguration \ No newline at end of file +com.win.framework.mybatis.config.WinMybatisAutoConfiguration +com.win.framework.datasource.utils.ShardingTablesLoadRunner \ No newline at end of file diff --git a/win-server/src/main/resources/application-dev.yaml b/win-server/src/main/resources/application-dev.yaml index 84ebc1c3..d94294c3 100644 --- a/win-server/src/main/resources/application-dev.yaml +++ b/win-server/src/main/resources/application-dev.yaml @@ -58,8 +58,7 @@ spring: # t_user 是逻辑表 infra_trends: # 配置数据节点，这里是按月分表 - #actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} - actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}} + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} tableStrategy: # 使用标准分片策略 standard: diff --git a/win-server/src/main/resources/application-prod.yaml b/win-server/src/main/resources/application-prod.yaml index 1ba72377..1eac7ae9 100644 --- a/win-server/src/main/resources/application-prod.yaml +++ b/win-server/src/main/resources/application-prod.yaml @@ -58,8 +58,7 @@ spring: # t_user 是逻辑表 infra_trends: # 配置数据节点，这里是按月分表 - #actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} - actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}} + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} tableStrategy: # 使用标准分片策略 standard: diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml index fbb776af..485af7d2 100644 --- a/win-server/src/main/resources/application-test.yaml +++ b/win-server/src/main/resources/application-test.yaml @@ -58,8 +58,7 @@ spring: # t_user 是逻辑表 infra_trends: # 配置数据节点，这里是按月分表 - #actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} - actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}} + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} tableStrategy: # 使用标准分片策略 standard: From 0e113148239988d74b43d31da6649df64feff386 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 23 Oct 2023 13:49:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9EJob=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/util/job/JobUtils.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java b/win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java new file mode 100644 index 00000000..d25f10e0 --- /dev/null +++ b/win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java @@ -0,0 +1,60 @@ +package com.win.framework.common.util.job; + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.mapstruct.ap.shaded.freemarker.template.utility.StringUtil; + +import java.io.IOException; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Job 工具类 + * 数量与任务是否一致(可配置) + * + * @author 闻荫源码 + */ +@Slf4j +public class JobUtils { + /** + * 解析JSON串,返回两个对象的集合 + * @param jobJson + * @param recordJson + * @return List + */ + public List parseJobAndRecord(String jobJson, String recordJson) { + //返回的对象集合 + List resList = new ArrayList(); + //判断前端传的数据是否为空 + if (StringUtils.isNotEmpty(jobJson)) { + // 任务参数 + JSONObject jobJsonObject = JSONUtil.parseObj(jobJson); + Map jobMap = jobJsonObject.get("job", Map.class); + resList.add(jobMap); + } + + //判断前端传的数据是否为空 + if (StringUtils.isNotEmpty(jobJson)) { + // 记录参数 + JSONObject recordJsonObject = JSONUtil.parseObj(recordJson); + Map recordMap = recordJsonObject.get("record", Map.class); + resList.add(recordMap); + } + return resList; + } + +} From 0b2d8919d3ae37078d13b4b4f72aa4530240644c Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Mon, 23 Oct 2023 14:21:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0tableName=E5=92=8CtableId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/win/module/infra/api/file/FileApi.java | 16 +++++++++++----- .../win/module/infra/api/file/FileApiImpl.java | 4 ++-- .../infra/controller/file/FileController.java | 2 +- .../controller/file/vo/file/FilePageReqVO.java | 6 ++++++ .../controller/file/vo/file/FileRespVO.java | 6 ++++++ .../controller/file/vo/file/FileUploadReqVO.java | 8 ++++++++ .../module/infra/dal/dataobject/file/FileDO.java | 9 ++++++++- .../module/infra/service/file/FileService.java | 4 +++- .../infra/service/file/FileServiceImpl.java | 4 +++- .../service/user/AdminUserServiceImpl.java | 2 +- 10 files changed, 49 insertions(+), 12 deletions(-) diff --git a/win-module-infra/win-module-infra-api/src/main/java/com/win/module/infra/api/file/FileApi.java b/win-module-infra/win-module-infra-api/src/main/java/com/win/module/infra/api/file/FileApi.java index 6c15c21f..d6c78ef1 100644 --- a/win-module-infra/win-module-infra-api/src/main/java/com/win/module/infra/api/file/FileApi.java +++ b/win-module-infra/win-module-infra-api/src/main/java/com/win/module/infra/api/file/FileApi.java @@ -11,10 +11,12 @@ public interface FileApi { * 保存文件，并返回文件的访问路径 * * @param content 文件内容 + * @param tableName 表名 + * @param tableId 表数据id * @return 文件路径 */ - default String createFile(byte[] content) { - return createFile(null, null, content); + default String createFile(byte[] content, String tableName, Long tableId) { + return createFile(null, null, content, tableName, tableId); } /** @@ -22,10 +24,12 @@ public interface FileApi { * * @param path 文件路径 * @param content 文件内容 + * @param tableName 表名 + * @param tableId 表数据id * @return 文件路径 */ - default String createFile(String path, byte[] content) { - return createFile(null, path, content); + default String createFile(String path, byte[] content, String tableName, Long tableId) { + return createFile(null, path, content, tableName, tableId); } /** @@ -34,8 +38,10 @@ public interface FileApi { * @param name 文件名称 * @param path 文件路径 * @param content 文件内容 + * @param tableName 表名 + * @param tableId 表数据id * @return 文件路径 */ - String createFile(String name, String path, byte[] content); + String createFile(String name, String path, byte[] content, String tableName, Long tableId); } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/file/FileApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/file/FileApiImpl.java index dcc2ae97..3c9c63e2 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/file/FileApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/file/FileApiImpl.java @@ -19,8 +19,8 @@ public class FileApiImpl implements FileApi { private FileService fileService; @Override - public String createFile(String name, String path, byte[] content) { - return fileService.createFile(name, path, content); + public String createFile(String name, String path, byte[] content, String tableName, Long tableId) { + return fileService.createFile(name, path, content, tableName, tableId); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/FileController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/FileController.java index d880a445..ffb3610b 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/FileController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/FileController.java @@ -46,7 +46,7 @@ public class FileController { public CommonResult uploadFile(FileUploadReqVO uploadReqVO) throws Exception { MultipartFile file = uploadReqVO.getFile(); String path = uploadReqVO.getPath(); - return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream()))); + return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream()), uploadReqVO.getTableName(), uploadReqVO.getTableId())); } @DeleteMapping("/delete") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FilePageReqVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FilePageReqVO.java index 3c5aa4ee..ecde578c 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FilePageReqVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FilePageReqVO.java @@ -27,4 +27,10 @@ public class FilePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "表名", example = "infraTrends") + private String tableName; + + @Schema(description = "表数据id", example = "9210") + private Long tableId; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileRespVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileRespVO.java index 440b0477..5cdcb33e 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileRespVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileRespVO.java @@ -33,4 +33,10 @@ public class FileRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; + @Schema(description = "表名", requiredMode = Schema.RequiredMode.REQUIRED) + private String tableName; + + @Schema(description = "表数据id", requiredMode = Schema.RequiredMode.REQUIRED) + private Long tableId; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileUploadReqVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileUploadReqVO.java index 08d736e4..312b60f6 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileUploadReqVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/file/vo/file/FileUploadReqVO.java @@ -17,4 +17,12 @@ public class FileUploadReqVO { @Schema(description = "文件附件", example = "winyuanma.png") private String path; + @Schema(description = "表名", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "表名不能为空") + private String tableName; + + @Schema(description = "表数据id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "表数据id不能为空") + private Long tableId; + } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/dal/dataobject/file/FileDO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/dal/dataobject/file/FileDO.java index 83034a01..76f3cd3e 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/dal/dataobject/file/FileDO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/dal/dataobject/file/FileDO.java @@ -51,5 +51,12 @@ public class FileDO extends BaseDO { * 文件大小 */ private Integer size; - + /** + * 表名 + */ + private String tableName; + /** + * 表数据id + */ + private Long tableId; } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileService.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileService.java index f6cddc5f..40e46105 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileService.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileService.java @@ -25,9 +25,11 @@ public interface FileService { * @param name 文件名称 * @param path 文件路径 * @param content 文件内容 + * @param tableName 表名 + * @param tableId 表数据id * @return 文件路径 */ - String createFile(String name, String path, byte[] content); + String createFile(String name, String path, byte[] content, String tableName, Long tableId); /** * 删除文件 diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java index 0d96113a..c469d1b7 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java @@ -38,7 +38,7 @@ public class FileServiceImpl implements FileService { @Override @SneakyThrows - public String createFile(String name, String path, byte[] content) { + public String createFile(String name, String path, byte[] content, String tableName, Long tableId) { // 计算默认的 path 名 String type = FileTypeUtils.getMineType(content, name); if (StrUtil.isEmpty(path)) { @@ -62,6 +62,8 @@ public class FileServiceImpl implements FileService { file.setUrl(url); file.setType(type); file.setSize(content.length); + file.setTableName(tableName); + file.setTableId(tableId); fileMapper.insert(file); return url; } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/user/AdminUserServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/user/AdminUserServiceImpl.java index f36e2e1c..0acd7f2d 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/user/AdminUserServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/user/AdminUserServiceImpl.java @@ -160,7 +160,7 @@ public class AdminUserServiceImpl implements AdminUserService { public String updateUserAvatar(Long id, InputStream avatarFile) throws Exception { validateUserExists(id); // 存储文件 - String avatar = fileApi.createFile(IoUtil.readBytes(avatarFile)); + String avatar = fileApi.createFile(IoUtil.readBytes(avatarFile), "systemUsers", id); // 更新路径 AdminUserDO sysUserDO = new AdminUserDO(); sysUserDO.setId(id); From d75d637238c57383b3597464f33868f54d17c79d Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 23 Oct 2023 15:15:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/wms/until}/job/JobUtils.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) rename {win-framework/win-common/src/main/java/com/win/framework/common/util => win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until}/job/JobUtils.java (54%) diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java similarity index 54% rename from win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java index d25f10e0..350c4c02 100644 --- a/win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java @@ -1,37 +1,17 @@ -package com.win.framework.common.util.job; +package com.win.module.wms.until.job; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.mapstruct.ap.shaded.freemarker.template.utility.StringUtil; +import org.apache.commons.lang.StringUtils; -import java.io.IOException; -import java.lang.reflect.Type; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; -/** - * Job 工具类 - * 数量与任务是否一致(可配置) - * - * @author 闻荫源码 - */ -@Slf4j public class JobUtils { /** - * 解析JSON串,返回两个对象的集合 + * 解析JSON串,返回两个对象的集合 + * * @param jobJson * @param recordJson * @return List From c2d8b7c353942c07decea182cc73d9f2f34b2a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 23 Oct 2023 19:36:57 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/infra/controller/redis/vo/RedisGetReqVo.java | 4 ++-- .../module/infra/controller/redis/vo/RedisUpdateReqVo.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java index 04219445..712bd4f7 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java @@ -15,8 +15,8 @@ public class RedisGetReqVo { @Schema(description = "缓存键", requiredMode = Schema.RequiredMode.REQUIRED, example = "basic_itembasic") @NotBlank(message = "缓存键不能为空") - @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "缓存键账号由 数字、字母 组成") - @Size(min = 4, max = 30, message = "缓存键长度为 4-30 个字符") + @Pattern(regexp = "^[a-zA-Z0-9]{3,30}$", message = "缓存键账号由 数字、字母 组成") + @Size(min = 3, max = 30, message = "缓存键长度为 3-30 个字符") private String key; } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java index 9a1fe2cd..5cd34758 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java @@ -15,8 +15,8 @@ public class RedisUpdateReqVo { @Schema(description = "缓存键", requiredMode = Schema.RequiredMode.REQUIRED, example = "basic_itembasic") @NotBlank(message = "缓存键不能为空") - @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "缓存键账号由 数字、字母 组成") - @Size(min = 4, max = 30, message = "缓存键长度为 4-30 个字符") + @Pattern(regexp = "^[a-zA-Z0-9]{3,30}$", message = "缓存键账号由 数字、字母 组成") + @Size(min = 3, max = 30, message = "缓存键长度为 3-30 个字符") private String key; @Schema(description = "缓存值", requiredMode = Schema.RequiredMode.REQUIRED, example = "个性化列表")