opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update-修改常量命名

Browse Source
This commit is contained in:
Ray 2023-12-27 14:31:42 +08:00
parent e7630e0da6
commit b68410ca45
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
View File

@ -82,5 +82,5 @@ public interface FlowConstant {
/** /**
* 模型标识key命名规范正则表达式 * 模型标识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}$";
} }

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
View File

@ -33,7 +33,7 @@ public class ModelBo extends PageEntity implements Serializable {
* 模型标识key * 模型标识key
*/ */
@NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class}) @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; private String key;
/** /**

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@ -229,7 +229,7 @@ public class ActModelServiceImpl implements IActModelService {
// 获取唯一标识key // 获取唯一标识key
String key = values.getFirst("key"); String key = values.getFirst("key");
// 校验key命名规范 // 校验key命名规范
if (!Validator.isMatchRegex(FlowConstant.MODE_KEY_PATTERN, key)) { if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, key)) {
throw new ServiceException("模型标识key只能字符或者下划线开头！"); throw new ServiceException("模型标识key只能字符或者下划线开头！");
} }
List<Model> list = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).list(); List<Model> list = repositoryService.createModelQuery().modelKey(key).modelTenantId(TenantHelper.getTenantId()).list();
@ -245,7 +245,7 @@ public class ActModelServiceImpl implements IActModelService {
if (StringUtils.isBlank(processId)) { if (StringUtils.isBlank(processId)) {
throw new ServiceException("流程标识不能为空！"); throw new ServiceException("流程标识不能为空！");
} }
if (!Validator.isMatchRegex(FlowConstant.MODE_KEY_PATTERN, processId)) { if (!Validator.isMatchRegex(FlowConstant.MODEL_KEY_PATTERN, processId)) {
throw new ServiceException("流程标识只能字符或者下划线开头！"); throw new ServiceException("流程标识只能字符或者下划线开头！");
} }