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 1/2] =?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 2/2] =?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 = "个性化列表")