From 93acbd775e747c54eaf54e9a70052021a409ae5c Mon Sep 17 00:00:00 2001 From: TanJ Date: Wed, 15 Oct 2025 10:09:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feta(RDMP-5834)=20=20keys=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/util/RedisUtils.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/RedisUtils.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/RedisUtils.java index fcb207f7a..852743db0 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/RedisUtils.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/RedisUtils.java @@ -455,31 +455,39 @@ public class RedisUtils { /** * 获得缓存的基本对象列表 + * 禁止使用,会导致Redis阻塞 * * @param pattern 字符串前缀 * @return 对象列表 */ + @Deprecated public static Collection keys(final String pattern) { - Stream stream = CLIENT.getKeys().getKeysStreamByPattern(pattern); - return stream.collect(Collectors.toList()); +// Stream stream = CLIENT.getKeys().getKeysStreamByPattern(pattern); +// return stream.collect(Collectors.toList()); + throw new UnsupportedOperationException("禁止使用keys命令,请使用scan"); } /** * 删除缓存的基本对象列表 * * @param pattern 字符串前缀 + * 禁止使用,会导致Redis阻塞 */ + @Deprecated public static void deleteKeys(final String pattern) { - CLIENT.getKeys().deleteByPattern(pattern); +// CLIENT.getKeys().deleteByPattern(pattern); + throw new UnsupportedOperationException("禁止使用keys命令,请使用scan"); } /** * 检查redis中是否存在key - * + * 禁止使用,会导致Redis阻塞 * @param key 键 */ + @Deprecated public static Boolean hasKey(String key) { - RKeys rKeys = CLIENT.getKeys(); - return rKeys.countExists(key) > 0; +// RKeys rKeys = CLIENT.getKeys(); +// return rKeys.countExists(key) > 0; + throw new UnsupportedOperationException("禁止使用keys命令,请使用scan"); } } From f6c13979aaed3a362fdac2bd60a46cdfde13b17e Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 31 Oct 2025 13:58:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-5965)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=9A=84=20valueof=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/common/enums/FileTypeEnum.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java index 08a8efa6b..6e010a885 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java @@ -35,6 +35,16 @@ public enum FileTypeEnum { return fromValue(type); } + public static FileTypeEnum valueOfLikeSuffix(String suffix) { + if (suffix == null) { + return UNKNOWN; + } + return Arrays.stream(FileTypeEnum.values()) + .filter(e -> e.getSuffix().contains(suffix)) + .findFirst() + .orElse(UNKNOWN); + } + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static FileTypeEnum fromValue(String value) { if (value == null) {