From b68410ca45d28fe5dbfcdc166a703a100878fb05 Mon Sep 17 00:00:00 2001 From: Ray <343509740@qq.com> Date: Wed, 27 Dec 2023 14:31:42 +0800 Subject: [PATCH] =?UTF-8?q?update-=E4=BF=AE=E6=94=B9=E5=B8=B8=E9=87=8F?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/workflow/common/constant/FlowConstant.java | 2 +- .../src/main/java/org/dromara/workflow/domain/bo/ModelBo.java | 2 +- .../dromara/workflow/service/impl/ActModelServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java index ed5ef4ece..0ccfd0fa5 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java @@ -82,5 +82,5 @@ public interface FlowConstant { /** * 模型标识key命名规范正则表达式 */ - String MODE_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$"; + String MODEL_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$"; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java index 733dba3ef..152f65445 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java @@ -33,7 +33,7 @@ public class ModelBo extends PageEntity implements Serializable { * 模型标识key */ @NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class}) - @Pattern(regexp = FlowConstant.MODE_KEY_PATTERN, message = "模型标识key只能字符或者下划线开头", groups = {AddGroup.class}) + @Pattern(regexp = FlowConstant.MODEL_KEY_PATTERN, message = "模型标识key只能字符或者下划线开头", groups = {AddGroup.class}) private String key; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java index 0a251fc90..1c0ea8c6b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java @@ -229,7 +229,7 @@ public class ActModelServiceImpl implements IActModelService { // 获取唯一标识key String key = values.getFirst("key"); // 校验key命名规范 - if (!Validator.isMatchRegex(FlowConstant.MODE_KEY_PATTERN, key)) { + if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, key)) { throw new ServiceException("模型标识key只能字符或者下划线开头！"); } List list = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).list(); @@ -245,7 +245,7 @@ public class ActModelServiceImpl implements IActModelService { if (StringUtils.isBlank(processId)) { throw new ServiceException("流程标识不能为空！"); } - if (!Validator.isMatchRegex(FlowConstant.MODE_KEY_PATTERN, processId)) { + if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, processId)) { throw new ServiceException("流程标识只能字符或者下划线开头！"); }