From 559af380227cd6eecc3f03126cd90930569deef5 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 22 May 2024 16:05:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E7=BB=84=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=92=8C=E5=9C=BA=E6=99=AF=E5=90=8D=E7=A7=B0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9F=AD=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/model/request/BatchDeleteRetryDeadLetterVO.java | 2 +- .../server/web/model/request/BatchDeleteRetryTaskVO.java | 2 +- .../web/model/request/BatchRollBackRetryDeadLetterVO.java | 2 +- .../snailjob/server/web/model/request/GroupConfigQueryVO.java | 2 +- .../server/web/model/request/GroupConfigRequestVO.java | 2 +- .../server/web/model/request/JobNotifyConfigRequestVO.java | 2 +- .../snailjob/server/web/model/request/JobRequestVO.java | 2 +- .../server/web/model/request/ManualTriggerTaskRequestVO.java | 2 +- .../server/web/model/request/NotifyConfigRequestVO.java | 2 +- .../aizuda/snailjob/server/web/model/request/ParseLogsVO.java | 2 +- .../model/request/RetryTaskUpdateExecutorNameRequestVO.java | 2 +- .../web/model/request/RetryTaskUpdateStatusRequestVO.java | 2 +- .../server/web/model/request/SceneConfigRequestVO.java | 4 ++-- .../snailjob/server/web/model/request/WorkflowRequestVO.java | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryDeadLetterVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryDeadLetterVO.java index 498be5941..06b6e0699 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryDeadLetterVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryDeadLetterVO.java @@ -21,7 +21,7 @@ public class BatchDeleteRetryDeadLetterVO { * 组名称 */ @NotBlank(message = "groupName 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryTaskVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryTaskVO.java index 95eba38bd..adb955cd0 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryTaskVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchDeleteRetryTaskVO.java @@ -20,7 +20,7 @@ public class BatchDeleteRetryTaskVO { * 组名称 */ @NotBlank(message = "groupName 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchRollBackRetryDeadLetterVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchRollBackRetryDeadLetterVO.java index d4a0e5b78..3a19e51d6 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchRollBackRetryDeadLetterVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/BatchRollBackRetryDeadLetterVO.java @@ -21,7 +21,7 @@ public class BatchRollBackRetryDeadLetterVO { * 组名称 */ @NotBlank(message = "groupName 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigQueryVO.java index ca4813d75..a890d7bda 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigQueryVO.java @@ -16,7 +16,7 @@ import jakarta.validation.constraints.Pattern; public class GroupConfigQueryVO extends BaseQueryVO { @NotBlank(message = "组名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotNull(message = "组状态不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigRequestVO.java index 01395bf81..4acd2848a 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/GroupConfigRequestVO.java @@ -16,7 +16,7 @@ import jakarta.validation.constraints.*; public class GroupConfigRequestVO { @NotBlank(message = "组名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") private String groupName; @NotNull(message = "组状态不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobNotifyConfigRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobNotifyConfigRequestVO.java index 98662804f..11d32ff30 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobNotifyConfigRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobNotifyConfigRequestVO.java @@ -17,7 +17,7 @@ public class JobNotifyConfigRequestVO { private Long id; @NotBlank(message = "组名称 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotNull(message = "任务不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobRequestVO.java index 656ef5b44..4f687478d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobRequestVO.java @@ -20,7 +20,7 @@ public class JobRequestVO { * 组名称 */ @NotBlank(message = "groupName 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ManualTriggerTaskRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ManualTriggerTaskRequestVO.java index 3637fbd84..07c5ec748 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ManualTriggerTaskRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ManualTriggerTaskRequestVO.java @@ -16,7 +16,7 @@ import java.util.List; public class ManualTriggerTaskRequestVO { @NotBlank(message = "groupName 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotEmpty(message = "uniqueIds 不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java index edf7ba960..17be206b3 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/NotifyConfigRequestVO.java @@ -19,7 +19,7 @@ public class NotifyConfigRequestVO { private Long id; @NotBlank(message = "组名称 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ParseLogsVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ParseLogsVO.java index d1188aff4..d9fc195e5 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ParseLogsVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/ParseLogsVO.java @@ -25,7 +25,7 @@ public class ParseLogsVO { * 组名称 */ @NotBlank(message = "组名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotNull(message = "重试状态不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java index 4856e2940..990361de7 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java @@ -22,7 +22,7 @@ public class RetryTaskUpdateExecutorNameRequestVO { * 组名称 */ @NotBlank(message = "组名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateStatusRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateStatusRequestVO.java index 06a71eb92..d6c68dbf4 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateStatusRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/RetryTaskUpdateStatusRequestVO.java @@ -25,7 +25,7 @@ public class RetryTaskUpdateStatusRequestVO { * 组名称 */ @NotBlank(message = "组名称 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; /** diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SceneConfigRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SceneConfigRequestVO.java index e812f0141..05ce8ec99 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SceneConfigRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/SceneConfigRequestVO.java @@ -14,11 +14,11 @@ import jakarta.validation.constraints.*; public class SceneConfigRequestVO { @NotBlank(message = "组名称 不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotBlank(message = "场景名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String sceneName; @NotNull(message = "场景状态不能为空") diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowRequestVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowRequestVO.java index cc4047f31..ccd8009af 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowRequestVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/WorkflowRequestVO.java @@ -23,7 +23,7 @@ public class WorkflowRequestVO { private Long id; @NotBlank(message = "组名称不能为空") - @Pattern(regexp = "^[A-Za-z0-9_]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母和下划线") + @Pattern(regexp = "^[A-Za-z0-9_-]{1,64}$", message = "仅支持长度为1~64字符且类型为数字、字母、下划线和短横线") private String groupName; @NotBlank(message = "工作流名称不能为空")