From 9dc7a121fe4bbbe82396fcb3974523e47d05e511 Mon Sep 17 00:00:00 2001 From: liuliaozhong Date: Mon, 29 Jan 2024 14:18:22 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84ESB/APIGW=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20#2733?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/i18n/validation/ValidationMessages.properties | 2 +- .../resources/i18n/validation/ValidationMessages_en.properties | 2 +- .../i18n/validation/ValidationMessages_en_US.properties | 2 +- .../resources/i18n/validation/ValidationMessages_zh.properties | 2 +- .../i18n/validation/ValidationMessages_zh_CN.properties | 2 +- .../crontab/model/esb/v3/request/EsbDeleteCronV3Request.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages.properties index 235f15e4a0..75fee5f361 100644 --- a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages.properties +++ b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages.properties @@ -47,7 +47,7 @@ validation.constraints.InvalidHighRiskRegularStatus.message=非法的规则启 validation.constraints.InvalidHighRiskRegularDescription_outOfLength.message=规则说明不能超过{max}个字符 validation.constraints.InvalidBkBizId.message=非法的业务 ID validation.constraints.InvalidCronId.message=非法的定时任务 ID -validation.constraints.CronId_empty.message=定时任务ID不能为空 +validation.constraints.CronId_null.message=定时任务ID不能为空 validation.constraints.InvalidCronJobPlanId.message=非法的作业 ID validation.constraints.InvalidCronJobName_empty.message=定时作业名称不能为空 validation.constraints.InvalidCronJobName_outOfLength.message=定时作业名称不能超过{max}个字符 diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en.properties index d0930d2c8f..82421144c9 100644 --- a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en.properties +++ b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en.properties @@ -47,7 +47,7 @@ validation.constraints.InvalidHighRiskRegularStatus.message=Invalid High-risk ex validation.constraints.InvalidHighRiskRegularDescription_outOfLength.message=High-risk explanation description can not exceed {max} characters validation.constraints.InvalidBkBizId.message=Invalid bk_biz_id validation.constraints.InvalidCronId.message=Invalid id -validation.constraints.CronId_empty.message=Cron id cannot be empty +validation.constraints.CronId_null.message=Cron id cannot be null validation.constraints.InvalidCronJobPlanId.message=Invalid job_plan_id validation.constraints.InvalidCronJobName_empty.message=Cron name cannot be empty validation.constraints.InvalidCronJobName_outOfLength.message=Cron name can not exceed {max} characters diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en_US.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en_US.properties index d0930d2c8f..82421144c9 100644 --- a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en_US.properties +++ b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_en_US.properties @@ -47,7 +47,7 @@ validation.constraints.InvalidHighRiskRegularStatus.message=Invalid High-risk ex validation.constraints.InvalidHighRiskRegularDescription_outOfLength.message=High-risk explanation description can not exceed {max} characters validation.constraints.InvalidBkBizId.message=Invalid bk_biz_id validation.constraints.InvalidCronId.message=Invalid id -validation.constraints.CronId_empty.message=Cron id cannot be empty +validation.constraints.CronId_null.message=Cron id cannot be null validation.constraints.InvalidCronJobPlanId.message=Invalid job_plan_id validation.constraints.InvalidCronJobName_empty.message=Cron name cannot be empty validation.constraints.InvalidCronJobName_outOfLength.message=Cron name can not exceed {max} characters diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh.properties index d859bc43fe..66837b4997 100644 --- a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh.properties +++ b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh.properties @@ -47,7 +47,7 @@ validation.constraints.InvalidHighRiskRegularStatus.message=非法的规则启 validation.constraints.InvalidHighRiskRegularDescription_outOfLength.message=规则说明不能超过{max}个字符 validation.constraints.InvalidBkBizId.message=非法的业务 ID validation.constraints.InvalidCronId.message=非法的定时任务 ID -validation.constraints.CronId_empty.message=定时任务ID不能为空 +validation.constraints.CronId_null.message=定时任务ID不能为空 validation.constraints.InvalidCronJobPlanId.message=非法的作业 ID validation.constraints.InvalidCronJobName_empty.message=定时作业名称不能为空 validation.constraints.InvalidCronJobName_outOfLength.message=定时作业名称不能超过{max}个字符 diff --git a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh_CN.properties b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh_CN.properties index 29fff1cc07..f20e6ede3c 100644 --- a/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh_CN.properties +++ b/src/backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages_zh_CN.properties @@ -47,7 +47,7 @@ validation.constraints.InvalidHighRiskRegularStatus.message=非法的规则启 validation.constraints.InvalidHighRiskRegularDescription_outOfLength.message=规则说明不能超过{max}个字符 validation.constraints.InvalidBkBizId.message=非法的业务ID validation.constraints.InvalidCronId.message=非法的定时任务ID -validation.constraints.CronId_empty.message=定时任务ID不能为空 +validation.constraints.CronId_null.message=定时任务ID不能为空 validation.constraints.InvalidCronJobPlanId.message=非法的作业ID validation.constraints.InvalidCronJobName_empty.message=定时作业名称不能为空 validation.constraints.InvalidCronJobName_outOfLength.message=定时作业名称不能超过{max}个字符 diff --git a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/esb/v3/request/EsbDeleteCronV3Request.java b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/esb/v3/request/EsbDeleteCronV3Request.java index e519dbe6ec..aa603d6b8f 100644 --- a/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/esb/v3/request/EsbDeleteCronV3Request.java +++ b/src/backend/job-crontab/api-job-crontab/src/main/java/com/tencent/bk/job/crontab/model/esb/v3/request/EsbDeleteCronV3Request.java @@ -40,7 +40,7 @@ public class EsbDeleteCronV3Request extends EsbAppScopeReq { /** * 定时作业 ID */ - @NotNull(message = "{validation.constraints.CronId_empty.message}") + @NotNull(message = "{validation.constraints.CronId_null.message}") @Min(value = 1L, message = "{validation.constraints.InvalidCronId.message}") private Long id; }