Merge remote-tracking branch 'origin/master'

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;
 
 }

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 = "个性化列表")

win-framework/win-common/src/main/java/com/win/framework/common/util/job/JobUtils.java → 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串,返回两个对象的集合
+     *
      * @param jobJson
      * @param recordJson
      * @return List<Map>