diff --git a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties index 9ee7f78839..73125cf339 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties @@ -41,6 +41,8 @@ functional_case.latest.length_range=Whether it is the latest version or not. The functional_case.latest.not_blank=whether it is the latest version cannot be empty functional_case.create_user.length_range=Creator length must be between 1 and 100 functional_case.create_user.not_blank=Creator cannot be empty +functional_case.cover.not_blank=Whether to cover the original use case cannot be empty +functional_case.file_source.not_blank=Use case file source cannot be empty #module：FunctionalCaseBlob functional_case_blob.functional_case_id.not_blank=Function case ID cannot be empty #module：FunctionalCaseComment @@ -51,6 +53,8 @@ functional_case_comment.create_user.length_range=The length of the reviewer must functional_case_comment.create_user.not_blank=Reviewer cannot be empty functional_case_comment.type.length_range=Comment type length must be between 1 and 64 functional_case_comment.type.not_blank=Comment type cannot be empty +functional_case_comment.content.not_blank=Comment content cannot be empty +functional_case_comment.event.not_blank=Comment type cannot be empty #module：FunctionalCaseModule functional_case_module.id.not_blank=ID cannot be empty functional_case_module.project_id.length_range=The length of the project ID must be between 1 and 50 @@ -93,9 +97,29 @@ functional_case_test.source_id.length_range=The length of the test ID must be be functional_case_test.source_id.not_blank=Test ID cannot be empty functional_case_test.source_type.length_range=The length of the test type must be between 1 and 64 functional_case_test.source_type.not_blank=Test type cannot be empty +functional_test_case.disassociate_type.not_blank=The associated use case type cannot be empty #FunctionalCaseCustomField functional_case_custom_field.case_id.not_blank=Case ID cannot be empty functional_case_custom_field.field_id.not_blank=Field ID cannot be empty +#FunctionalCaseDemand +functional_case_demand.demand_platform.not_blank=Requirement platform cannot be empty +functional_case_demand.demand_name.not_blank=Requirement title cannot be empty +functional_case_demand.with_parent.not_blank=Whether it is related to the parent requirement cannot be empty +functional_case_demand.parent.not_blank=Parent requirement ID cannot be empty +functional_case_demand.case_id.not_blank=Function case ID cannot be empty +functional_case_demand.id.not_blank=Requirement ID cannot be empty +functional_case_demand.demand_name.length_range=Requirements title length must be between 1 and 255 +functional_case_demand.parent.length_range=Parent requirement ID must be between 1 and 255 +functional_case_demand.case_id.length_range=Functional use case ID must be between 1 and 50 +functional_case_demand.id.length_range=Requirement ID must be between 1 and 50 +#FunctionalCaseFollower +functional_case_follower.case_id.not_blank=Function case ID cannot be empty +functional_case_follower.user_id.not_blank=Followers cannot be empty +#FunctionalMinderExtraNode +functional_minder_extra_node.id.not_blank=Brain map nodes cannot be empty +functional_minder_extra_node.parent_id.not_blank=The parent node of the brain map cannot be empty +functional_minder_extra_node.group_id.not_blank=Project ID cannot be empty +functional_minder_extra_node.node_data.not_blank=The additional information stored in the brain map node cannot be empty #module：MinderExtraNode minder_extra_node.id.not_blank=ID cannot be empty minder_extra_node.parent_id.length_range=The length of the parent node ID must be between 1 and 50 @@ -108,6 +132,13 @@ minder_extra_node.type.not_blank=Node type cannot be empty case_review.id.not_blank=ID cannot be empty case_review.name.length_range=The name length must be between 1 and 200 case_review.name.not_blank=Name cannot be empty +case_review.module_id.not_blank=The module it belongs to cannot be empty +case_review.reviewers.not_empty=The default reviewer cannot be empty +case_review.copy_id.not_blank=The copied id of the use case review cannot be empty +case_review.case_review_id.not_blank=Use case review id cannot be empty +case_review.user_ids.not_empty=Reviewer cannot be empty +case_review_case.project_id.not_blank = The project id to which the functional use case belongs cannot be empty +case_review.move_mode.not_blank=Node movement type cannot be empty case_review.status.length_range=The length of the review status must be between 1 and 64 case_review.status.not_blank=Review status cannot be empty case_review.project_id.length_range=The length of the project ID must be between 1 and 50 @@ -116,9 +147,26 @@ case_review.create_user.length_range=Creator length must be between 1 and 50 case_review.create_user.not_blank=Creator cannot be empty case_review.review_pass_rule.length_range=The length of the review rule must be between 1 and 64 case_review.review_pass_rule.not_blank=Review rule cannot be empty +#module：CaseReviewModule +case_review_module.id.not_blank=ID cannot be empty +case_review_module.project_id.not_blank=Project ID cannot be empty +case_review_module.name.not_blank=Name cannot be empty +case_review_module.parent_id.not_blank=Parent node ID cannot be empty +case_review_module.pos.not_blank=The order under the same node cannot be empty #module：CaseReviewUser case_review_user.review_id.not_blank=Review ID cannot be empty case_review_user.user_id.not_blank=Reviewer ID cannot be empty +#module：CaseReviewHistory +case_review_history.id.not_blank=ID cannot be empty +case_review_history.id.length_range=ID length must be between 1 and 50 +case_review_history.review_id.not_blank=Review ID cannot be empty +case_review_history.review_id.length_range=Review ID length must be between 1 and 50 +case_review_history.case_id.not_blank=Function case ID cannot be empty +case_review_history.case_id.length_range=The function case ID length must be between 1 and 50 +case_review_history.status.not_blank=The review result cannot be empty +case_review_history.status.length_range=The review result length must be between 1 and 64 +case_review_history.deleted.not_blank=Whether the association is canceled or the review is deleted cannot be empty +case_review_history.abandoned.not_blank=Whether the review record is abandoned cannot be empty. #module：CaseReviewFunctionalCase case_review_functional_case.id.not_blank=ID cannot be empty case_review_functional_case.review_id.length_range=The length of the review ID must be between 1 and 50 @@ -138,9 +186,14 @@ case_review_functional_case_user.review_id.length_range=The length of the review case_review_functional_case_user.review_id.not_blank=Review ID cannot be empty case_review_functional_case_user.user_id.length_range=Reviewer ID length must be between 1 and 50 case_review_functional_case_user.user_id.not_blank=Reviewer ID cannot be empty -#module：CaseReviewFollow -case_review_follow.review_id.not_blank=Review ID cannot be empty -case_review_follow.follow_id.not_blank=follower cannot be empty +#CaseReviewFunctionalCaseArchive +case_review_functional_case_archive.review_id.not_blank=Review ID cannot be empty +case_review_functional_case_archive.review_id.length_range=The length of the review ID must be between 1 and 50 +case_review_functional_case_archive.case_id.not_blank=Function case ID cannot be empty +case_review_functional_case_archive.case_id.length_range=The function case ID length must be between 1 and 50 +#module：CaseReviewFollower +case_review_follower.review_id.not_blank=Review ID cannot be empty +case_review_follower.follow_id.not_blank=follower cannot be empty #module：CustomFieldTestCase custom_field_test_case.resource_id.not_blank=Resource ID cannot be empty custom_field_test_case.field_id.not_blank=Field ID cannot be empty diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties index fd71bac8ef..c33809c250 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties @@ -40,6 +40,8 @@ functional_case.latest.length_range=是否为最新版本长度必须在1-1之 functional_case.latest.not_blank=是否为最新版本不能为空 functional_case.create_user.length_range=创建人长度必须在1-100之间 functional_case.create_user.not_blank=创建人不能为空 +functional_case.cover.not_blank=是否覆盖原用例不能为空 +functional_case.file_source.not_blank=用例文件来源不能为空 #module：FunctionalCaseBlob functional_case_blob.functional_case_id.not_blank=功能用例ID不能为空 #module：FunctionalCaseComment @@ -50,6 +52,8 @@ functional_case_comment.create_user.length_range=评论人长度必须在1-50之 functional_case_comment.create_user.not_blank=评论人不能为空 functional_case_comment.type.length_range=评论类型长度必须在1-64之间 functional_case_comment.type.not_blank=评论类型不能为空 +functional_case_comment.content.not_blank=评论内容不能为空 +functional_case_comment.event.not_blank=评论类型不能为空 #module：FunctionalCaseModule functional_case_module.id.not_blank=ID不能为空 functional_case_module.project_id.length_range=项目ID长度必须在1-50之间 @@ -92,9 +96,29 @@ functional_case_test.source_id.length_range=其他类型用例ID长度必须在1 functional_case_test.source_id.not_blank=其他类型用例ID不能为空 functional_case_test.source_type.length_range=用例类型长度必须在1-64之间 functional_case_test.source_type.not_blank=用例类型不能为空 +functional_test_case.disassociate_type.not_blank=关联的用例类型不能为空 #FunctionalCaseCustomField functional_case_custom_field.case_id.not_blank=功能用例ID不能为空 functional_case_custom_field.field_id.not_blank=自定义字段ID不能为空 +#FunctionalCaseDemand +functional_case_demand.demand_platform.not_blank=需求平台不能为空 +functional_case_demand.demand_name.not_blank=需求标题不能为空 +functional_case_demand.with_parent.not_blank=与父需求是否关联不能为空 +functional_case_demand.parent.not_blank=父需求ID不能为空 +functional_case_demand.case_id.not_blank=功能用例ID不能为空 +functional_case_demand.id.not_blank=需求ID不能为空 +functional_case_demand.demand_name.length_range=需求标题长度必须在1-255之间 +functional_case_demand.parent.length_range=父需求ID必须在1-255之间 +functional_case_demand.case_id.length_range=功能用例ID必须在1-50之间 +functional_case_demand.id.length_range=需求ID必须在1-50之间 +#FunctionalCaseFollower +functional_case_follower.case_id.not_blank=功能用例ID不能为空 +functional_case_follower.user_id.not_blank=关注人不能为空 +#FunctionalMinderExtraNode +functional_minder_extra_node.id.not_blank=脑图节点不能为空 +functional_minder_extra_node.parent_id.not_blank=脑图父节点不能为空 +functional_minder_extra_node.group_id.not_blank=项目ID不能为空 +functional_minder_extra_node.node_data.not_blank=存储脑图节点额外信息不能为空 #module：MinderExtraNode minder_extra_node.id.not_blank=ID不能为空 minder_extra_node.parent_id.length_range=父节点的ID长度必须在1-50之间 @@ -107,6 +131,13 @@ minder_extra_node.type.not_blank=类型不能为空 case_review.id.not_blank=ID不能为空 case_review.name.length_range=名称长度必须在1-200之间 case_review.name.not_blank=名称不能为空 +case_review.module_id.not_blank=模块不能为空 +case_review.reviewers.not_empty=默认评审人不能为空 +case_review.copy_id.not_blank=用例评审被复制的ID不能为空 +case_review.case_review_id.not_blank=用例评审ID不能为空 +case_review.user_ids.not_empty=评审人不能为空 +case_review.move_mode.not_blank=节点移动类型不能为空 +case_review_case.project_id.not_blank=功能用例所属项目ID不能为空 case_review.status.length_range=评审状态长度必须在1-64之间 case_review.status.not_blank=评审状态不能为空 case_review.project_id.length_range=项目ID长度必须在1-50之间 @@ -115,9 +146,26 @@ case_review.create_user.length_range=创建人长度必须在1-50之间 case_review.create_user.not_blank=创建人不能为空 case_review.review_pass_rule.length_range=评审规则长度必须在1-64之间 case_review.review_pass_rule.not_blank=评审规则不能为空 +#module：CaseReviewModule +case_review_module.id.not_blank=ID不能为空 +case_review_module.project_id.not_blank=项目ID不能为空 +case_review_module.name.not_blank=名称不能为空 +case_review_module.parent_id.not_blank=父节点ID不能为空 +case_review_module.pos.not_blank=同一节点下的顺序不能为空 #module：CaseReviewUser case_review_user.review_id.not_blank=评审ID不能为空 case_review_user.user_id.not_blank=评审人ID不能为空 +#module：CaseReviewHistory +case_review_history.id.not_blank=ID不能为空 +case_review_history.id.length_range=ID长度必须在1-50之间 +case_review_history.review_id.not_blank=评审ID不能为空 +case_review_history.review_id.length_range=评审ID长度必须在1-50之间 +case_review_history.case_id.not_blank=功能用例ID不能为空 +case_review_history.case_id.length_range=功能用例ID长度必须在1-50之间 +case_review_history.status.not_blank=评审结果不能为空 +case_review_history.status.length_range=评审结果长度必须在1-64之间 +case_review_history.deleted.not_blank=是否是取消关联或评审被删除的不能为空 +case_review_history.abandoned.not_blank=是否是废弃的评审记录不能为空 #module：CaseReviewFunctionalCase case_review_functional_case.id.not_blank=ID不能为空 case_review_functional_case.review_id.length_range=评审ID长度必须在1-50之间 @@ -137,9 +185,14 @@ case_review_functional_case_user.review_id.length_range=评审ID长度必须在1 case_review_functional_case_user.review_id.not_blank=评审ID不能为空 case_review_functional_case_user.user_id.length_range=评审人ID长度必须在1-50之间 case_review_functional_case_user.user_id.not_blank=评审人ID不能为空 -#module：CaseReviewFollow -case_review_follow.review_id.not_blank=评审ID不能为空 -case_review_follow.follow_id.not_blank=关注人不能为空 +#CaseReviewFunctionalCaseArchive +case_review_functional_case_archive.review_id.not_blank=评审ID不能为空 +case_review_functional_case_archive.review_id.length_range=评审ID长度必须在1-50之间 +case_review_functional_case_archive.case_id.not_blank=功能用例ID不能为空 +case_review_functional_case_archive.case_id.length_range=功能用例ID长度必须在1-50之间 +#module：CaseReviewFollower +case_review_follower.review_id.not_blank=评审ID不能为空 +case_review_follower.follow_id.not_blank=关注人不能为空 #module：CustomFieldTestCase custom_field_test_case.resource_id.not_blank=资源ID不能为空 custom_field_test_case.field_id.not_blank=字段ID不能为空 diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties index fb55d20706..b257805c4f 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties @@ -41,6 +41,8 @@ functional_case.latest.length_range=是否为最新版本長度必須在1-1之 functional_case.latest.not_blank=是否为最新版本不能為空 functional_case.create_user.length_range=創建人長度必須在1-100之間 functional_case.create_user.not_blank=創建人不能為空 +functional_case.cover.not_blank=是否覆蓋原用例不能為空 +functional_case.file_source.not_blank=用例文件來源不能為空 #module：FunctionalCaseBlob functional_case_blob.functional_case_id.not_blank=功能用例ID不能為空 #module：FunctionalCaseComment @@ -51,6 +53,8 @@ functional_case_comment.create_user.length_range=評論人長度必須在1-50之 functional_case_comment.create_user.not_blank=評論人不能為空 functional_case_comment.type.length_range=評論類型長度必須在1-64之間 functional_case_comment.type.not_blank=評論類型不能為空 +functional_case_comment.content.not_blank=評論內容不能為空 +functional_case_comment.event.not_blank=評論類型不能為空 #module：FunctionalCaseModule functional_case_module.id.not_blank=ID不能為空 functional_case_module.project_id.length_range=項目ID長度必須在1-50之間 @@ -93,9 +97,29 @@ functional_case_test.source_id.length_range=其他類型用例ID長度必須在1 functional_case_test.source_id.not_blank=其他類型用例ID不能為空 functional_case_test.source_type.length_range=用例類型長度必須在1-64之間 functional_case_test.source_type.not_blank=用例類型不能為空 +functional_test_case.disassociate_type.not_blank=關聯的用例類型不能為空 #FunctionalCaseCustomField functional_case_custom_field.case_id.not_blank=功能用例ID不能爲空 functional_case_custom_field.field_id.not_blank=自定義字段ID不能爲空 +#FunctionalCaseDemand +functional_case_demand.demand_platform.not_blank=需求平台不能為空 +functional_case_demand.demand_name.not_blank=需求標題不能為空 +functional_case_demand.with_parent.not_blank=與父需求是否關聯不能為空 +functional_case_demand.parent.not_blank=父需求ID不能為空 +functional_case_demand.case_id.not_blank=功能用例ID不能為空 +functional_case_demand.id.not_blank=需求ID不能為空 +functional_case_demand.demand_name.length_range=需求標題長度必須在1-255之間 +functional_case_demand.parent.length_range=父需求ID必須在1-255之間 +functional_case_demand.case_id.length_range=功能用例ID必須在1-50之間 +functional_case_demand.id.length_range=需求ID必須在1-50之間 +#FunctionalCaseFollower +functional_case_follower.case_id.not_blank=功能用例ID不能為空 +functional_case_follower.user_id.not_blank=關注人不能為空 +#FunctionalMinderExtraNode +functional_minder_extra_node.id.not_blank=腦圖節點不能為空 +functional_minder_extra_node.parent_id.not_blank=腦圖父節點不能為空 +functional_minder_extra_node.group_id.not_blank=專案ID不能為空 +functional_minder_extra_node.node_data.not_blank=儲存腦圖節點額外資訊不能為空 #module：MinderExtraNode minder_extra_node.id.not_blank=ID不能為空 minder_extra_node.parent_id.length_range=父節點的ID長度必須在1-50之間 @@ -108,6 +132,13 @@ minder_extra_node.type.not_blank=類型不能為空 case_review.id.not_blank=ID不能為空 case_review.name.length_range=名稱長度必須在1-200之間 case_review.name.not_blank=名稱不能為空 +case_review.reviewers.not_empty=預設評審人不能為空 +case_review.module_id.not_blank=模組不能為空 +case_review.copy_id.not_blank=用例評審被複製的ID不能為空 +case_review.case_review_id.not_blank=用例評審ID不能為空 +case_review.user_ids.not_empty=評審者不能為空 +case_review_case.project_id.not_blank = 功能用例所屬項目ID不能為空白 +case_review.move_mode.not_blank=節點移動類型不能為空 case_review.status.length_range=評審狀態長度必須在1-64之間 case_review.status.not_blank=評審狀態不能為空 case_review.project_id.length_range=項目ID長度必須在1-50之間 @@ -116,9 +147,26 @@ case_review.create_user.length_range=創建人長度必須在1-50之間 case_review.create_user.not_blank=創建人不能為空 case_review.review_pass_rule.length_range=評審規則長度必須在1-64之間 case_review.review_pass_rule.not_blank=評審規則不能為空 +#module：CaseReviewModule +case_review_module.id.not_blank=ID不能為空 +case_review_module.project_id.not_blank=項目ID不能為空 +case_review_module.name.not_blank=名稱不能為空 +case_review_module.parent_id.not_blank=父節點ID不能為空 +case_review_module.pos.not_blank=同一節點下的順序不能為空 #module：CaseReviewUser case_review_user.review_id.not_blank=評審ID不能為空 case_review_user.user_id.not_blank=評審人ID不能為空 +#module：CaseReviewHistory +case_review_history.id.not_blank=ID不能為空 +case_review_history.id.length_range=ID長度必須在1-50之間 +case_review_history.review_id.not_blank=評審ID不能為空 +case_review_history.review_id.length_range=評審ID長度必須在1-50之間 +case_review_history.case_id.not_blank=功能用例ID不能為空 +case_review_history.case_id.length_range=功能用例ID長度必須在1-50之間 +case_review_history.status.not_blank=評審結果不能為空 +case_review_history.status.length_range=評審結果長度必須在1-64之間 +case_review_history.deleted.not_blank=是否是取消關聯或評審被刪除的不能為空 +case_review_history.abandoned.not_blank=是否為廢棄的評審紀錄不能為空 #module：CaseReviewFunctionalCase case_review_functional_case.id.not_blank=ID不能為空 case_review_functional_case.review_id.length_range=評審ID長度必須在1-50之間 @@ -138,9 +186,14 @@ case_review_functional_case_user.review_id.length_range=評審ID長度必須在1 case_review_functional_case_user.review_id.not_blank=評審ID不能為空 case_review_functional_case_user.user_id.length_range=評審人ID長度必須在1-50之間 case_review_functional_case_user.user_id.not_blank=評審人ID不能為空 -#module：CaseReviewFollow -case_review_follow.review_id.not_blank=評審ID不能為空 -case_review_follow.follow_id.not_blank=關注人不能為空 +#CaseReviewFunctionalCaseArchive +case_review_functional_case_archive.review_id.not_blank=評審ID不能為空 +case_review_functional_case_archive.review_id.length_range=評審ID長度必須在1-50之間 +case_review_functional_case_archive.case_id.not_blank=功能用例ID不能為空 +case_review_functional_case_archive.case_id.length_range=功能用例ID長度必須在1-50之間 +#module：CaseReviewFollower +case_review_follower.review_id.not_blank=評審ID不能為空 +case_review_follower.follow_id.not_blank=關注人不能為空 #module：CustomFieldTestCase custom_field_test_case.resource_id.not_blank=資源ID不能為空 custom_field_test_case.field_id.not_blank=字段ID不能為空 diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/AssociatePlanPageRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/AssociatePlanPageRequest.java index cf6c8beafb..ff6708510f 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/AssociatePlanPageRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/AssociatePlanPageRequest.java @@ -14,7 +14,7 @@ public class AssociatePlanPageRequest extends BaseProviderCondition { @Schema(description = "功能用例id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{associate_plan_page_request.case_id.not_blank}") + @NotBlank(message = "{functional_case_comment.case_id.not_blank}") private String caseId; diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseAssociateCaseRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseAssociateCaseRequest.java index c764bffd19..2a1ea5a969 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseAssociateCaseRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BaseAssociateCaseRequest.java @@ -12,7 +12,7 @@ import java.util.List; public class BaseAssociateCaseRequest extends BaseFunctionalCaseBatchDTO { @Schema(description = "功能用例选择的项目id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_associate_request.project_id.not_blank}") + @NotBlank(message = "{case_review_case.project_id.not_blank}") private String projectId; @Schema(description = "默认评审人", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BatchReviewFunctionalCaseRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BatchReviewFunctionalCaseRequest.java index 16db6b50c4..eb822f9e7f 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/BatchReviewFunctionalCaseRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/BatchReviewFunctionalCaseRequest.java @@ -14,7 +14,7 @@ public class BatchReviewFunctionalCaseRequest extends BaseReviewCaseBatchRequest private String reviewPassRule; @Schema(description = "评审结果:未评审(UN_REVIEWED)/评审中(UNDER_REVIEWED)/PASS(通过)/UN_PASS(未通过)/RE_REVIEWED(重新提审)") - @NotBlank(message = "{functional_case.status.not_blank}") + @NotBlank(message = "{case_review.status.not_blank}") private String status; @Schema(description = "评论内容") diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewAssociateRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewAssociateRequest.java index 2b314c547e..2c8b053097 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewAssociateRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewAssociateRequest.java @@ -19,15 +19,15 @@ public class CaseReviewAssociateRequest implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "用例评审id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_associate_request.case_review_id.not_blank}") + @NotBlank(message = "{case_review.case_review_id.not_blank}") private String reviewId; @Schema(description = "用例评审所在的项目id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_associate_request.project_id.not_blank}") + @NotBlank(message = "{case_review.project_id.not_blank}") private String projectId; @Schema(description = "评审人") - @NotEmpty(message = "{case_review_associate_request.user_ids.not_empty}") + @NotEmpty(message = "{case_review.user_ids.not_empty}") private List reviewers; @Schema(description = "查询功能用例的条件") diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewCopyRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewCopyRequest.java index eb6b13f0f9..c25567afb4 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewCopyRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewCopyRequest.java @@ -8,6 +8,6 @@ import lombok.Data; public class CaseReviewCopyRequest extends CaseReviewRequest{ @Schema(description = "被复制的用例评审id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_copy_request.copy_id.not_blank}") + @NotBlank(message = "{case_review.copy_id.not_blank}") private String copyId; } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFollowerRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFollowerRequest.java index b511d3ab0a..f706f88a53 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFollowerRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFollowerRequest.java @@ -17,11 +17,11 @@ public class CaseReviewFollowerRequest implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{user_id.not_blank}") + @NotBlank(message = "{bug_follower.user_id.not_blank}") private String userId; @Schema(description = "用例评审id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review.id.not_blank}") + @NotBlank(message = "{functional_case_demand.case_id.not_blank}") private String caseReviewId; } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFunctionalCasePosRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFunctionalCasePosRequest.java index 2e0f722d50..51c247860f 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFunctionalCasePosRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/CaseReviewFunctionalCasePosRequest.java @@ -9,6 +9,6 @@ import lombok.Data; public class CaseReviewFunctionalCasePosRequest extends PosRequest { @Schema(description = "用例评审Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_functional_case.review_id.not_blank}") + @NotBlank(message = "{case_review.case_review_id.not_blank}") private String reviewId; } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/DisassociateOtherCaseRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/DisassociateOtherCaseRequest.java index 7b25a46846..09c7ab436f 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/DisassociateOtherCaseRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/DisassociateOtherCaseRequest.java @@ -9,11 +9,11 @@ import lombok.Data; public class DisassociateOtherCaseRequest extends BaseFunctionalCaseBatchDTO { @Schema(description = "功能用例选择的项目id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_test_case_disassociate_request.case_id.not_blank}") + @NotBlank(message = "{case_review_case.project_id.not_blank}") private String caseId; @Schema(description = "关联用例的类型(API,SCENARIO,UI,PERFORMANCE)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_test_case_disassociate_request.type.not_blank}") + @NotBlank(message = "{functional_test_case.disassociate_type.not_blank}") private String sourceType; diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseCommentRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseCommentRequest.java index 0a7600433c..76f89db9ff 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseCommentRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseCommentRequest.java @@ -37,7 +37,7 @@ public class FunctionalCaseCommentRequest { private String event; @Schema(description = "项目Id") - @NotBlank(message = "{project.id.not_blank}") + @NotBlank(message = "{functional_case.project_id.not_blank}") private String projectId; /** diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseDemandBatchRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseDemandBatchRequest.java index ca6306fca2..e2de28f52b 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseDemandBatchRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseDemandBatchRequest.java @@ -15,7 +15,7 @@ import java.util.List; public class FunctionalCaseDemandBatchRequest extends BaseFunctionalCaseBatchDTO { @Schema(description = "项目ID") - @NotBlank(message = "{functional_case_demand.projectId.not_blank}") + @NotBlank(message = "{functional_case.project_id.not_blank}") private String projectId; @Schema(description = "需求所属平台(本地创建为系统平台名称)") diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseFollowerRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseFollowerRequest.java index e8d9cc0537..e423c28c5b 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseFollowerRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseFollowerRequest.java @@ -17,7 +17,7 @@ public class FunctionalCaseFollowerRequest implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{user_id.not_blank}") + @NotBlank(message = "{bug_follower.user_id.not_blank}") private String userId; @Schema(description = "用例id", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseImportRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseImportRequest.java index 34cd6bf14d..a89f2575fb 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseImportRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseImportRequest.java @@ -25,6 +25,6 @@ public class FunctionalCaseImportRequest implements Serializable { private String versionId; @Schema(description = "是否覆盖原用例", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{is_null}") + @NotBlank(message = "{functional_case.cover.not_blank}") private boolean cover; } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseModuleCreateRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseModuleCreateRequest.java index 09fb3b120e..79e5c91b2c 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseModuleCreateRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseModuleCreateRequest.java @@ -19,7 +19,7 @@ public class FunctionalCaseModuleCreateRequest implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project.id.not_blank}") + @NotBlank(message = "{functional_case.project_id.not_blank}") private String projectId; @Schema(description = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseSourceFileRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseSourceFileRequest.java index 640f553865..6db2709494 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseSourceFileRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseSourceFileRequest.java @@ -25,7 +25,7 @@ public class FunctionalCaseSourceFileRequest implements Serializable { private String caseId; @Schema(description = "文件来源:附件(ATTACHMENT)/功能用例详情(CASE_DETAIL)/用例评论(CASE_COMMENT)/评审评论(REVIEW_COMMENT)") - @NotBlank(message = "{functional_case_source_file_request.file_source.not_blank}") + @NotBlank(message = "{functional_case.file_source.not_blank}") private String fileSource; @Schema(description = "是否本地",requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseTestRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseTestRequest.java index 85aa97ddee..df68729547 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseTestRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseTestRequest.java @@ -10,7 +10,7 @@ import lombok.Data; public class FunctionalCaseTestRequest extends BasePageRequest { @Schema(description = "关联关系表里主ID eg:功能用例关联接口用例时为功能用例id") - @NotBlank(message = "{api_definition.project_id.not_blank}") + @NotBlank(message = "{custom_field_test_case.resource_id.not_blank}") @Size(min = 1, max = 50, message = "{api_definition.project_id.length_range}") private String sourceId; diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalThirdDemandPageRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalThirdDemandPageRequest.java index a55aa7558c..aef74b64d6 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalThirdDemandPageRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalThirdDemandPageRequest.java @@ -10,7 +10,7 @@ public class FunctionalThirdDemandPageRequest extends BasePageRequest { @Schema(description = "ms系统当前的项目id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_third_demand_page_request.project_id.not_blank}") + @NotBlank(message = "{case_review.project_id.not_blank}") private String projectId; } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCasePageRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCasePageRequest.java index 26e6b91aba..1f077cf9e7 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCasePageRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCasePageRequest.java @@ -18,11 +18,11 @@ public class ReviewFunctionalCasePageRequest extends BasePageRequest implements private static final long serialVersionUID = 1L; @Schema(description = "评审id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_user.review_id.not_blank}") + @NotBlank(message = "{case_review.case_review_id.not_blank}") private String reviewId; @Schema(description = "用例所在项目ID(默认当前项目)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review_user.project_id.not_blank}") + @NotBlank(message = "{case_review.project_id.not_blank}") private String projectId; @Schema(description = "是否只看我的", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCaseRequest.java b/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCaseRequest.java index 504febcc56..71d0a6a2d5 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCaseRequest.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/request/ReviewFunctionalCaseRequest.java @@ -14,11 +14,11 @@ public class ReviewFunctionalCaseRequest { private String projectId; @Schema(description = "用例评审Id") - @NotBlank(message = "{case_review.review_id.not_blank}") + @NotBlank(message = "{case_review.case_review_id.not_blank}") private String reviewId; @Schema(description = "功能用例id") - @NotBlank(message = "{functional_case.case_id.not_blank}") + @NotBlank(message = "{functional_case_blob.functional_case_id.not_blank}") private String caseId; @Schema(description = "评审规则") diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/request/PosRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/request/PosRequest.java index d544cc6ac7..bde860feeb 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/request/PosRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/request/PosRequest.java @@ -23,14 +23,14 @@ public class PosRequest implements Serializable { private String projectId; @Schema(description = "目标用例id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review.name.not_blank}") + @NotBlank(message = "{functional_case_relationship_edge.target_id.not_blank}") private String targetId; @Schema(description = "移动类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = {"BEFORE", "AFTER", "APPEND"}) - @NotBlank(message = "{case_review.module_id.not_blank}") + @NotBlank(message = "{case_review.moveMode.not_blank}") private String moveMode; @Schema(description = "移动用例id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{case_review.module_id.not_blank}") + @NotBlank(message = "{functional_case_relationship_edge.source_id.not_blank}") private String moveId; }