From 48a578d634ae5f2dc3efdfa7993c2f864670a6b0 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 22 May 2023 16:37:41 +0800 Subject: [PATCH] build: ui domain --- .../java/io/metersphere/ui/domain/UiCustomCommandBlob.java | 4 ++-- .../main/java/io/metersphere/ui/domain/UiScenarioBlob.java | 6 +++--- .../java/io/metersphere/ui/domain/UiScenarioReportBlob.java | 4 ++-- backend/framework/sdk/src/main/resources/i18n/ui.properties | 6 +++--- .../sdk/src/main/resources/i18n/ui_en_US.properties | 6 +++--- .../sdk/src/main/resources/i18n/ui_zh_CN.properties | 6 +++--- .../sdk/src/main/resources/i18n/ui_zh_TW.properties | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiCustomCommandBlob.java b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiCustomCommandBlob.java index c355bff686..299fdf88bd 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiCustomCommandBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiCustomCommandBlob.java @@ -20,9 +20,9 @@ import java.io.Serializable; public class UiCustomCommandBlob extends UiCustomCommand implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{ui_custom_command_blob.scenario_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{ui_custom_command_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "场景ID", required = true, allowableValues="range[1, 255]") - private String scenarioId; + private String id; @ApiModelProperty(name = "场景定义", required = false, allowableValues="range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioBlob.java b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioBlob.java index a7f3fe590f..f72c1b358b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioBlob.java @@ -20,9 +20,9 @@ import java.io.Serializable; public class UiScenarioBlob extends UiScenario implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{ui_scenario_blob.scenario_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "场景ID", required = true, allowableValues = "range[1, 255]") - private String scenarioId; + @NotBlank(message = "{ui_scenario_blob.id.not_blank}", groups = {Updated.class}) + @ApiModelProperty(name = "场景ID", required = true, allowableValues = "range[1, 50]") + private String id; @ApiModelProperty(name = "场景定义", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioReportBlob.java b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioReportBlob.java index 707a079e50..7d7fd7a06a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioReportBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/ui/domain/UiScenarioReportBlob.java @@ -18,9 +18,9 @@ import java.io.Serializable; public class UiScenarioReportBlob extends UiScenarioReport implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{ui_scenario_report_blob.report_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{ui_scenario_report_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "报告ID", required = true, allowableValues = "range[1, 50]") - private String reportId; + private String id; @ApiModelProperty(name = "描述", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/sdk/src/main/resources/i18n/ui.properties b/backend/framework/sdk/src/main/resources/i18n/ui.properties index 28df6c2c07..52c3af380b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/ui.properties +++ b/backend/framework/sdk/src/main/resources/i18n/ui.properties @@ -68,7 +68,7 @@ ui_scenario_report.trigger_mode.length_range= ui_scenario_report.trigger_mode.not_blank= ui_scenario_report.create_user.length_range= ui_scenario_report.create_user.not_blank= -ui_scenario_report_blob.report_id.not_blank= +ui_scenario_report_blob.id.not_blank= ui_scenario.id.not_blank= ui_scenario.project_id.length_range= ui_scenario.project_id.not_blank= @@ -144,8 +144,8 @@ ui_scenario_reference.reference_id.length_range= ui_scenario_reference.reference_id.not_blank= ui_scenario_reference.data_type.length_range= ui_scenario_reference.data_type.not_blank= -ui_custom_command_blob.scenario_id.not_blank= +ui_custom_command_blob.id.not_blank= ui_scenario_report_structure.id.not_blank= ui_scenario_report_structure.report_id.length_range= ui_scenario_report_structure.report_id.not_blank= -ui_scenario_blob.scenario_id.not_blank= +ui_scenario_blob.id.not_blank= diff --git a/backend/framework/sdk/src/main/resources/i18n/ui_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/ui_en_US.properties index a8bf87328a..f87988b2e3 100644 --- a/backend/framework/sdk/src/main/resources/i18n/ui_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/ui_en_US.properties @@ -68,7 +68,7 @@ ui_scenario_report.trigger_mode.length_range=UI Scenario Report Trigger Mode len ui_scenario_report.trigger_mode.not_blank=UI Scenario Report Trigger Mode is required ui_scenario_report.create_user.length_range=UI Scenario Report Create User length must be between {min} and {max} ui_scenario_report.create_user.not_blank=UI Scenario Report Create User is required -ui_scenario_report_blob.report_id.not_blank=UI Scenario Report Blob Report ID is required +ui_scenario_report_blob.id.not_blank=UI Scenario Report Blob Report ID is required ui_scenario.id.not_blank=UI Scenario ID is required ui_scenario.project_id.length_range=UI Scenario Project ID length must be between {min} and {max} ui_scenario.project_id.not_blank=UI Scenario Project ID is required @@ -144,8 +144,8 @@ ui_scenario_reference.reference_id.length_range=UI Scenario Reference ID length ui_scenario_reference.reference_id.not_blank=UI Scenario Reference ID is required ui_scenario_reference.data_type.length_range=UI Scenario Reference Data Type length must be between {min} and {max} ui_scenario_reference.data_type.not_blank=UI Scenario Reference Data Type is required -ui_custom_command_blob.scenario_id.not_blank=UI Custom Command Blob Scenario ID is required +ui_custom_command_blob.id.not_blank=UI Custom Command Blob Scenario ID is required ui_scenario_report_structure.id.not_blank=UI Scenario Report Structure ID is required ui_scenario_report_structure.report_id.length_range=UI Scenario Report Structure Report ID length must be between {min} and {max} ui_scenario_report_structure.report_id.not_blank=UI Scenario Report Structure Report ID is required -ui_scenario_blob.scenario_id.not_blank=UI Scenario Blob Scenario ID is required +ui_scenario_blob.id.not_blank=UI Scenario Blob Scenario ID is required diff --git a/backend/framework/sdk/src/main/resources/i18n/ui_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/ui_zh_CN.properties index 4fcb27384b..9fd3fc25c1 100644 --- a/backend/framework/sdk/src/main/resources/i18n/ui_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/ui_zh_CN.properties @@ -68,7 +68,7 @@ ui_scenario_report.trigger_mode.length_range=UI场景报告触发模式长度范 ui_scenario_report.trigger_mode.not_blank=UI场景报告触发模式不能为空 ui_scenario_report.create_user.length_range=UI场景报告创建人长度范围为{min}到{max} ui_scenario_report.create_user.not_blank=UI场景报告创建人不能为空 -ui_scenario_report_blob.report_id.not_blank=UI场景报告blob报告ID不能为空 +ui_scenario_report_blob.id.not_blank=UI场景报告blob报告ID不能为空 ui_scenario.id.not_blank=UI场景ID不能为空 ui_scenario.project_id.length_range=UI场景项目ID长度范围为{min}到{max} ui_scenario.project_id.not_blank=UI场景项目ID不能为空 @@ -144,8 +144,8 @@ ui_scenario_reference.reference_id.length_range=UI场景引用引用ID长度范 ui_scenario_reference.reference_id.not_blank=UI场景引用引用ID不能为空 ui_scenario_reference.data_type.length_range=UI场景引用数据类型长度范围为{min}到{max} ui_scenario_reference.data_type.not_blank=UI场景引用数据类型不能为空 -ui_custom_command_blob.scenario_id.not_blank=UI自定义命令场景ID不能为空 +ui_custom_command_blob.id.not_blank=UI自定义命令场景ID不能为空 ui_scenario_report_structure.id.not_blank=UI场景报告结构ID不能为空 ui_scenario_report_structure.report_id.length_range=UI场景报告结构报告ID长度范围为{min}到{max} ui_scenario_report_structure.report_id.not_blank=UI场景报告结构报告ID不能为空 -ui_scenario_blob.scenario_id.not_blank=UI场景场景ID不能为空 +ui_scenario_blob.id.not_blank=UI场景场景ID不能为空 diff --git a/backend/framework/sdk/src/main/resources/i18n/ui_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/ui_zh_TW.properties index 2fceb31adb..c1b4bb5b0a 100644 --- a/backend/framework/sdk/src/main/resources/i18n/ui_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/ui_zh_TW.properties @@ -68,7 +68,7 @@ ui_scenario_report.trigger_mode.length_range=UI場景報告觸發模式長度範 ui_scenario_report.trigger_mode.not_blank=UI場景報告觸發模式不能為空 ui_scenario_report.create_user.length_range=UI場景報告創建人長度範圍為{min}到{max} ui_scenario_report.create_user.not_blank=UI場景報告創建人不能為空 -ui_scenario_report_blob.report_id.not_blank=UI場景報告blob報告ID不能為空 +ui_scenario_report_blob.id.not_blank=UI場景報告blob報告ID不能為空 ui_scenario.id.not_blank=UI場景ID不能為空 ui_scenario.project_id.length_range=UI場景項目ID長度範圍為{min}到{max} ui_scenario.project_id.not_blank=UI場景項目ID不能為空 @@ -144,8 +144,8 @@ ui_scenario_reference.reference_id.length_range=UI場景引用引用ID長度範 ui_scenario_reference.reference_id.not_blank=UI場景引用引用ID不能為空 ui_scenario_reference.data_type.length_range=UI場景引用數據類型長度範圍為{min}到{max} ui_scenario_reference.data_type.not_blank=UI場景引用數據類型不能為空 -ui_custom_command_blob.scenario_id.not_blank=UI自定義命令場景ID不能為空 +ui_custom_command_blob.id.not_blank=UI自定義命令場景ID不能為空 ui_scenario_report_structure.id.not_blank=UI場景報告結構ID不能為空 ui_scenario_report_structure.report_id.length_range=UI場景報告結構報告ID長度範圍為{min}到{max} ui_scenario_report_structure.report_id.not_blank=UI場景報告結構報告ID不能為空 -ui_scenario_blob.scenario_id.not_blank=UI場景場景ID不能為空 \ No newline at end of file +ui_scenario_blob.id.not_blank=UI場景場景ID不能為空 \ No newline at end of file