diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java index ec00a402b5..7a5a6a8cb7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; - import java.io.Serializable; @ApiModel(value = "自定义字段") @@ -17,63 +16,71 @@ import java.io.Serializable; @Data public class CustomField implements Serializable { private static final long serialVersionUID = 1L; - + @TableId @NotBlank(message = "{custom_field.id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "自定义字段ID", required = true, allowableValues = "range[1, 100]") + @ApiModelProperty(name = "自定义字段ID", required = true, allowableValues="range[1, 100]") private String id; - + @Size(min = 1, max = 64, message = "{custom_field.name.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field.name.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "自定义字段名称", required = true, allowableValues = "range[1, 64]") + @ApiModelProperty(name = "自定义字段名称", required = true, allowableValues="range[1, 64]") private String name; - + @Size(min = 1, max = 30, message = "{custom_field.scene.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field.scene.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "使用场景", required = true, allowableValues = "range[1, 30]") + @ApiModelProperty(name = "使用场景", required = true, allowableValues="range[1, 30]") private String scene; - + @Size(min = 1, max = 30, message = "{custom_field.type.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field.type.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "自定义字段类型", required = true, allowableValues = "range[1, 30]") + @ApiModelProperty(name = "自定义字段类型", required = true, allowableValues="range[1, 30]") private String type; - - - @ApiModelProperty(name = "自定义字段备注", required = false, allowableValues = "range[1, 255]") + + + + @ApiModelProperty(name = "自定义字段备注", required = false, allowableValues="range[1, 255]") private String remark; - - - @ApiModelProperty(name = "自定义字段选项", required = false, allowableValues = "range[1, ]") + + + + @ApiModelProperty(name = "自定义字段选项", required = false, allowableValues="range[1, ]") private String options; - - - @ApiModelProperty(name = "是否是系统字段", required = false, allowableValues = "range[1, 1]") + + + + @ApiModelProperty(name = "是否是系统字段", required = false, allowableValues="range[1, ]") private Boolean system; - - - @ApiModelProperty(name = "是否是全局字段", required = false, allowableValues = "range[1, 1]") + + + + @ApiModelProperty(name = "是否是全局字段", required = false, allowableValues="range[1, ]") private Boolean global; - - - @ApiModelProperty(name = "创建时间", required = true, allowableValues = "range[1, ]") + + + + @ApiModelProperty(name = "创建时间", required = true, allowableValues="range[1, ]") private Long createTime; - - - @ApiModelProperty(name = "更新时间", required = true, allowableValues = "range[1, ]") + + + + @ApiModelProperty(name = "更新时间", required = true, allowableValues="range[1, ]") private Long updateTime; - - - @ApiModelProperty(name = "创建人", required = false, allowableValues = "range[1, 100]") + + + + @ApiModelProperty(name = "创建人", required = false, allowableValues="range[1, 100]") private String createUser; - - - @ApiModelProperty(name = "项目ID", required = false, allowableValues = "range[1, 64]") + + + + @ApiModelProperty(name = "项目ID", required = false, allowableValues="range[1, 64]") private String projectId; - - @Size(min = 1, max = 1, message = "{custom_field.third_part.length_range}", groups = {Created.class, Updated.class}) - @NotBlank(message = "{custom_field.third_part.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "是否关联第三方", required = true, allowableValues = "range[1, 1]") + + + + @ApiModelProperty(name = "是否关联第三方", required = true, allowableValues="range[1, ]") private Boolean thirdPart; - + } \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldApi.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldApi.java deleted file mode 100644 index a00cdfdb84..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldApi.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.metersphere.project.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.metersphere.validation.groups.Updated; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.io.Serializable; - -@ApiModel(value = "自定义字段关系") -@TableName("custom_field_api") -@Data -public class CustomFieldApi implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId - @NotBlank(message = "{custom_field_api.resource_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "资源ID", required = true, allowableValues = "range[1, 50]") - private String resourceId; - - @TableId - @NotBlank(message = "{custom_field_api.field_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "字段ID", required = true, allowableValues = "range[1, 50]") - private String fieldId; - - - @ApiModelProperty(name = "字段值", required = false, allowableValues = "range[1, 500]") - private String value; - - - @ApiModelProperty(name = "", required = false, allowableValues = "range[1, ]") - private byte[] textValue; - - -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldIssue.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldIssue.java deleted file mode 100644 index 31aed8e2dc..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldIssue.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.metersphere.project.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; - -import java.io.Serializable; - -@ApiModel(value = "自定义字段缺陷关系") -@TableName("custom_field_issue") -@Data -public class CustomFieldIssue implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId - @NotBlank(message = "{custom_field_issue.resource_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "资源ID", required = true, allowableValues = "range[1, 50]") - private String resourceId; - - @TableId - @NotBlank(message = "{custom_field_issue.field_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "字段ID", required = true, allowableValues = "range[1, 50]") - private String fieldId; - - - @ApiModelProperty(name = "字段值", required = false, allowableValues = "range[1, 1000]") - private String value; - - - @ApiModelProperty(name = "", required = false, allowableValues = "range[1, ]") - private byte[] textValue; - - -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTemplate.java index ef4001e04f..88a4fe858b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTemplate.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTemplate.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; - import java.io.Serializable; @ApiModel(value = "自定义模版") @@ -17,46 +16,51 @@ import java.io.Serializable; @Data public class CustomFieldTemplate implements Serializable { private static final long serialVersionUID = 1L; - + @TableId @NotBlank(message = "{custom_field_template.id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "自定义模版ID", required = true, allowableValues = "range[1, 50]") + @ApiModelProperty(name = "自定义模版ID", required = true, allowableValues="range[1, 50]") private String id; - + @Size(min = 1, max = 50, message = "{custom_field_template.field_id.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field_template.field_id.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "自定义字段ID", required = true, allowableValues = "range[1, 50]") + @ApiModelProperty(name = "自定义字段ID", required = true, allowableValues="range[1, 50]") private String fieldId; - + @Size(min = 1, max = 50, message = "{custom_field_template.template_id.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field_template.template_id.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "模版ID", required = true, allowableValues = "range[1, 50]") + @ApiModelProperty(name = "模版ID", required = true, allowableValues="range[1, 50]") private String templateId; - + @Size(min = 1, max = 30, message = "{custom_field_template.scene.length_range}", groups = {Created.class, Updated.class}) @NotBlank(message = "{custom_field_template.scene.not_blank}", groups = {Created.class}) - @ApiModelProperty(name = "使用场景", required = true, allowableValues = "range[1, 30]") + @ApiModelProperty(name = "使用场景", required = true, allowableValues="range[1, 30]") private String scene; - - - @ApiModelProperty(name = "是否必填", required = false, allowableValues = "range[1, 1]") + + + + @ApiModelProperty(name = "是否必填", required = false, allowableValues="range[1, ]") private Boolean required; - - - @ApiModelProperty(name = "排序字段", required = false, allowableValues = "range[1, ]") + + + + @ApiModelProperty(name = "排序字段", required = false, allowableValues="range[1, ]") private Integer pos; - - - @ApiModelProperty(name = "默认值", required = false, allowableValues = "range[1, ]") + + + + @ApiModelProperty(name = "默认值", required = false, allowableValues="range[1, ]") private byte[] defaultValue; - - - @ApiModelProperty(name = "自定义数据", required = false, allowableValues = "range[1, 255]") + + + + @ApiModelProperty(name = "自定义数据", required = false, allowableValues="range[1, 255]") private String customData; - - - @ApiModelProperty(name = "自定义表头", required = false, allowableValues = "range[1, 1]") + + + + @ApiModelProperty(name = "自定义表头", required = false, allowableValues="range[1, 1]") private String key; - + } \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTestCase.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTestCase.java deleted file mode 100644 index 110596f676..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFieldTestCase.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.metersphere.project.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.metersphere.validation.groups.Updated; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.io.Serializable; - -@ApiModel(value = "自定义字段功能用例关系") -@TableName("custom_field_test_case") -@Data -public class CustomFieldTestCase implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId - @NotBlank(message = "{custom_field_test_case.resource_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "资源ID", required = true, allowableValues = "range[1, 50]") - private String resourceId; - - @TableId - @NotBlank(message = "{custom_field_test_case.field_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "字段ID", required = true, allowableValues = "range[1, 50]") - private String fieldId; - - - @ApiModelProperty(name = "字段值", required = false, allowableValues = "range[1, 1000]") - private String value; - - - @ApiModelProperty(name = "", required = false, allowableValues = "range[1, ]") - private String textValue; - - -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java index ad36c2a3e1..49cac58120 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java @@ -19,9 +19,9 @@ public class CustomFunctionBlob extends CustomFunction implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{custom_function_blob.function_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{custom_function_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "", required = true, allowableValues = "range[1, 50]") - private String functionId; + private String id; @ApiModelProperty(name = "参数列表", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java index c558bf980d..8faee07326 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java @@ -21,9 +21,9 @@ public class FakeErrorBlob extends FakeError implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{fake_error_blob.fake_error_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{fake_error_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "Test ID", required = true, allowableValues = "range[1, 50]") - private String fakeErrorId; + private String id; @ApiModelProperty(name = "内容", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java index cd5f1aebe2..e35c0d6744 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java @@ -21,9 +21,9 @@ public class FileMetadataBlob extends FileMetadata implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{file_metadata_blob.file_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{file_metadata_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "文件ID", required = true, allowableValues = "range[1, 255]") - private String fileId; + private String id; @ApiModelProperty(name = "储存库", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java index 79c0227627..6245063d60 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java @@ -23,7 +23,7 @@ public class FileModuleBlob extends FileModule implements Serializable { @TableId @NotBlank(message = "{file_module_blob.file_module_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "ID", required = true, allowableValues = "range[1, 50]") - private String fileModuleId; + private String id; @ApiModelProperty(name = "存储库描述", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java new file mode 100644 index 0000000000..438bb70b07 --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java @@ -0,0 +1,56 @@ +package io.metersphere.project.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import java.io.Serializable; + +@ApiModel(value = "功能用例模版") +@TableName("functional_case_template") +@Data +public class FunctionalCaseTemplate implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + @NotBlank(message = "{functional_case_template.id.not_blank}", groups = {Updated.class}) + @ApiModelProperty(name = "ID", required = true, allowableValues="range[1, 50]") + private String id; + + @Size(min = 1, max = 64, message = "{functional_case_template.name.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{functional_case_template.name.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "名称", required = true, allowableValues="range[1, 64]") + private String name; + + + + @ApiModelProperty(name = "描述", required = false, allowableValues="range[1, 255]") + private String description; + + + + @ApiModelProperty(name = "是否是系统模板", required = true, allowableValues="range[1, ]") + private Boolean system; + + + + @ApiModelProperty(name = "创建时间", required = true, allowableValues="range[1, ]") + private Long createTime; + + @Size(min = 1, max = 50, message = "{functional_case_template.create_user.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{functional_case_template.create_user.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "创建人", required = true, allowableValues="range[1, 50]") + private String createUser; + + @Size(min = 1, max = 50, message = "{functional_case_template.project_id.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{functional_case_template.project_id.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "项目ID", required = true, allowableValues="range[1, 50]") + private String projectId; + + +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java new file mode 100644 index 0000000000..edddb8b213 --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java @@ -0,0 +1,58 @@ +package io.metersphere.project.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@ApiModel(value = "功能用例模版扩展") +@TableName("functional_case_template_extend") +@Data +@EqualsAndHashCode(callSuper = false) +public class FunctionalCaseTemplateExtend extends FunctionalCaseTemplate implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + @NotBlank(message = "{functional_case_template_extend.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, 255]") + private String caseName; + + + @ApiModelProperty(name = "前置条件模板", required = false, allowableValues = "range[1, ]") + private String prerequisite; + + + @ApiModelProperty(name = "步骤描述模板", required = false, allowableValues = "range[1, ]") + private String stepDescription; + + + @ApiModelProperty(name = "预期结果模板", required = false, allowableValues = "range[1, ]") + private String expectedResult; + + + @ApiModelProperty(name = "实际结果模板", required = false, allowableValues = "range[1, ]") + private String actualResult; + + @Size(min = 1, max = 64, message = "{functional_case_template_extend.step_model.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{functional_case_template_extend.step_model.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "编辑模式模板：步骤模式/文本模式", required = true, allowableValues = "range[1, 64]") + private String stepModel; + + + @ApiModelProperty(name = "用例步骤", required = false, allowableValues = "range[1, ]") + private String steps; + + +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java new file mode 100644 index 0000000000..071cc28a26 --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java @@ -0,0 +1,56 @@ +package io.metersphere.project.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import java.io.Serializable; + +@ApiModel(value = "缺陷模版") +@TableName("issue_template") +@Data +public class IssueTemplate implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + @NotBlank(message = "{issue_template.id.not_blank}", groups = {Updated.class}) + @ApiModelProperty(name = "ID", required = true, allowableValues="range[1, 50]") + private String id; + + @Size(min = 1, max = 64, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{issue_template.name.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "名称", required = true, allowableValues="range[1, 64]") + private String name; + + + + @ApiModelProperty(name = "描述", required = false, allowableValues="range[1, 255]") + private String description; + + + + @ApiModelProperty(name = "是否是系统模板", required = true, allowableValues="range[1, ]") + private Boolean system; + + + + @ApiModelProperty(name = "创建时间", required = true, allowableValues="range[1, ]") + private Long createTime; + + @Size(min = 1, max = 50, message = "{issue_template.create_user.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{issue_template.create_user.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "创建人", required = true, allowableValues="range[1, 50]") + private String createUser; + + @Size(min = 1, max = 50, message = "{issue_template.project_id.length_range}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{issue_template.project_id.not_blank}", groups = {Created.class}) + @ApiModelProperty(name = "项目ID", required = true, allowableValues="range[1, 50]") + private String projectId; + + +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java new file mode 100644 index 0000000000..3c11f16f54 --- /dev/null +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java @@ -0,0 +1,37 @@ +package io.metersphere.project.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@ApiModel(value = "缺陷模板扩展") +@TableName("issue_template_extend") +@Data +@EqualsAndHashCode(callSuper = false) +public class IssueTemplateExtend extends IssueTemplate implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId + @NotBlank(message = "{issue_template_extend.id.not_blank}", groups = {Updated.class}) + @ApiModelProperty(name = "缺陷模板ID", required = true, allowableValues = "range[1, 100]") + private String id; + + + @ApiModelProperty(name = "缺陷标题模板", required = false, allowableValues = "range[1, 64]") + private String title; + + + @ApiModelProperty(name = "缺陷内容模板", required = false, allowableValues = "range[1, ]") + private String content; + + +} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java index dcec9fb23f..13296df9c5 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java @@ -9,19 +9,21 @@ import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; @ApiModel(value = "项目扩展") @TableName("project_extend") @Data -public class ProjectExtend implements Serializable { +@EqualsAndHashCode(callSuper = false) +public class ProjectExtend extends Project implements Serializable { private static final long serialVersionUID = 1L; @TableId @NotBlank(message = "{project_extend.project_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "项目ID", required = true, allowableValues = "range[1, 50]") - private String projectId; + private String id; @ApiModelProperty(name = "", required = false, allowableValues = "range[1, 50]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java index c9770aa472..4e720e9a1b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTaskBlob.java @@ -21,9 +21,9 @@ public class MessageTaskBlob extends MessageTask implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{message_task_blob.message_task_id.not_blank}", groups = {Updated.class}) - @ApiModelProperty(name = "", required = true, allowableValues = "range[1, 255]") - private String messageTaskId; + @NotBlank(message = "{message_task_blob.id.not_blank}", groups = {Updated.class}) + @ApiModelProperty(name = "", 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/system/domain/PluginBlob.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java index 4cd83bad8c..b52a7729e1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/PluginBlob.java @@ -15,13 +15,13 @@ import java.io.Serializable; @ApiModel(value = "插件大字段") @TableName("plugin_blob") @Data -public class PluginBlob implements Serializable { +public class PluginBlob extends Plugin implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{plugin_blob.plugin_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{plugin_blob.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "ID", required = true, allowableValues = "range[1, 50]") - private String pluginId; + private String id; @ApiModelProperty(name = "plugin form option", required = false, allowableValues = "range[1, ]") diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java index 9f2e6f0ba8..2e48cf32ae 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExtend.java @@ -13,13 +13,13 @@ import java.io.Serializable; @ApiModel(value = "用户扩展") @TableName("user_extend") @Data -public class UserExtend implements Serializable { +public class UserExtend extends User implements Serializable { private static final long serialVersionUID = 1L; @TableId - @NotBlank(message = "{user_extend.user_id.not_blank}", groups = {Updated.class}) + @NotBlank(message = "{user_extend.id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "用户ID", required = true, allowableValues = "range[1, 50]") - private String userId; + private String id; @ApiModelProperty(name = "其他平台对接信息", required = false, allowableValues = "range[1, 2000]") diff --git a/backend/framework/sdk/src/main/resources/i18n/project.properties b/backend/framework/sdk/src/main/resources/i18n/project.properties index e69de29bb2..758ec568eb 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project.properties @@ -0,0 +1,92 @@ +fake_error.id.not_blank +fake_error.project_id.length_range +fake_error.project_id.not_blank +fake_error.create_user.length_range +fake_error.create_user.not_blank +fake_error.update_user.length_range +fake_error.update_user.not_blank +fake_error.error_code.length_range +fake_error.error_code.not_blank +fake_error.match_type.length_range +fake_error.match_type.not_blank +issue_template_extend.id.not_blank +project_application.project_id.not_blank +project_application.type.not_blank +custom_function_blob.id.not_blank +fake_error_blob.id.not_blank +file_module.id.not_blank +file_module.project_id.length_range +file_module.project_id.not_blank +file_module.name.length_range +file_module.name.not_blank +custom_field_template.id.not_blank +custom_field_template.field_id.length_range +custom_field_template.field_id.not_blank +custom_field_template.template_id.length_range +custom_field_template.template_id.not_blank +custom_field_template.scene.length_range +custom_field_template.scene.not_blank +file_metadata_blob.id.not_blank +issue_template.id.not_blank +issue_template.name.length_range +issue_template.name.not_blank +issue_template.create_user.length_range +issue_template.create_user.not_blank +issue_template.project_id.length_range +issue_template.project_id.not_blank +functional_case_template.id.not_blank +functional_case_template.name.length_range +functional_case_template.name.not_blank +functional_case_template.create_user.length_range +functional_case_template.create_user.not_blank +functional_case_template.project_id.length_range +functional_case_template.project_id.not_blank +api_template.id.not_blank +api_template.name.length_range +api_template.name.not_blank +api_template.system.length_range +api_template.system.not_blank +api_template.global.length_range +api_template.global.not_blank +project_extend.project_id.not_blank +project_extend.platform.length_range +project_extend.platform.not_blank +project.id.not_blank +project.workspace_id.length_range +project.workspace_id.not_blank +project.name.length_range +project.name.not_blank +custom_function.id.not_blank +custom_function.name.length_range +custom_function.name.not_blank +custom_function.type.length_range +custom_function.type.not_blank +custom_function.create_user.length_range +custom_function.create_user.not_blank +custom_function.project_id.length_range +custom_function.project_id.not_blank +custom_field.id.not_blank +custom_field.name.length_range +custom_field.name.not_blank +custom_field.scene.length_range +custom_field.scene.not_blank +custom_field.type.length_range +custom_field.type.not_blank +file_module_blob.file_module_id.not_blank +project_version.id.not_blank +project_version.project_id.length_range +project_version.project_id.not_blank +project_version.name.length_range +project_version.name.not_blank +project_version.latest.length_range +project_version.latest.not_blank +project_version.create_user.length_range +project_version.create_user.not_blank +file_metadata.id.not_blank +file_metadata.name.length_range +file_metadata.name.not_blank +file_metadata.storage.length_range +file_metadata.storage.not_blank +functional_case_template_extend.id.not_blank +functional_case_template_extend.step_model.length_range +functional_case_template_extend.step_model.not_blank diff --git a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties index e69de29bb2..74a9691fe2 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties @@ -0,0 +1,92 @@ +fake_error.id.not_blank=ID is required +fake_error.project_id.length_range=Project ID length must be between {min} and {max} +fake_error.project_id.not_blank=Project ID is required +fake_error.create_user.length_range=Create User length must be between {min} and {max} +fake_error.create_user.not_blank=Create User is required +fake_error.update_user.length_range=Update User length must be between {min} and {max} +fake_error.update_user.not_blank=Update User is required +fake_error.error_code.length_range=Error Code length must be between {min} and {max} +fake_error.error_code.not_blank=Error Code is required +fake_error.match_type.length_range=Match Type length must be between {min} and {max} +fake_error.match_type.not_blank=Match Type is required +issue_template_extend.id.not_blank=ID is required +project_application.project_id.not_blank=Project ID is required +project_application.type.not_blank=Type is required +custom_function_blob.id.not_blank=ID is required +fake_error_blob.id.not_blank=ID is required +file_module.id.not_blank=ID is required +file_module.project_id.length_range=Project ID length must be between {min} and {max} +file_module.project_id.not_blank=Project ID is required +file_module.name.length_range=Name length must be between {min} and {max} +file_module.name.not_blank=Name is required +custom_field_template.id.not_blank=ID is required +custom_field_template.field_id.length_range=Field ID length must be between {min} and {max} +custom_field_template.field_id.not_blank=Field ID is required +custom_field_template.template_id.length_range=Template ID length must be between {min} and {max} +custom_field_template.template_id.not_blank=Template ID is required +custom_field_template.scene.length_range=Scene length must be between {min} and {max} +custom_field_template.scene.not_blank=Scene is required +file_metadata_blob.id.not_blank=ID is required +issue_template.id.not_blank=ID is required +issue_template.name.length_range=Name length must be between {min} and {max} +issue_template.name.not_blank=Name is required +issue_template.create_user.length_range=Create User length must be between {min} and {max} +issue_template.create_user.not_blank=Create User is required +issue_template.project_id.length_range=Project ID length must be between {min} and {max} +issue_template.project_id.not_blank=Project ID is required +functional_case_template.id.not_blank=ID is required +functional_case_template.name.length_range=Name length must be between {min} and {max} +functional_case_template.name.not_blank=Name is required +functional_case_template.create_user.length_range=Create User length must be between {min} and {max} +functional_case_template.create_user.not_blank=Create User is required +functional_case_template.project_id.length_range=Project ID length must be between {min} and {max} +functional_case_template.project_id.not_blank=Project ID is required +api_template.id.not_blank=ID is required +api_template.name.length_range=Name length must be between {min} and {max} +api_template.name.not_blank=Name is required +api_template.system.length_range=System length must be between {min} and {max} +api_template.system.not_blank=System is required +api_template.global.length_range=Global length must be between {min} and {max} +api_template.global.not_blank=Global is required +project_extend.project_id.not_blank=Project ID is required +project_extend.platform.length_range=Platform length must be between {min} and {max} +project_extend.platform.not_blank=Platform is required +project.id.not_blank=ID is required +project.workspace_id.length_range=Workspace ID length must be between {min} and {max} +project.workspace_id.not_blank=Workspace ID is required +project.name.length_range=Name length must be between {min} and {max} +project.name.not_blank=Name is required +custom_function.id.not_blank=ID is required +custom_function.name.length_range=Name length must be between {min} and {max} +custom_function.name.not_blank=Name is required +custom_function.type.length_range=Type length must be between {min} and {max} +custom_function.type.not_blank=Type is required +custom_function.create_user.length_range=Create User length must be between {min} and {max} +custom_function.create_user.not_blank=Create User is required +custom_function.project_id.length_range=Project ID length must be between {min} and {max} +custom_function.project_id.not_blank=Project ID is required +custom_field.id.not_blank=ID is required +custom_field.name.length_range=Name length must be between {min} and {max} +custom_field.name.not_blank=Name is required +custom_field.scene.length_range=Scene length must be between {min} and {max} +custom_field.scene.not_blank=Scene is required +custom_field.type.length_range=Type length must be between {min} and {max} +custom_field.type.not_blank=Type is required +file_module_blob.file_module_id.not_blank=File Module ID is required +project_version.id.not_blank=ID is required +project_version.project_id.length_range=Project ID length must be between {min} and {max} +project_version.project_id.not_blank=Project ID is required +project_version.name.length_range=Name length must be between {min} and {max} +project_version.name.not_blank=Name is required +project_version.latest.length_range=Latest length must be between {min} and {max} +project_version.latest.not_blank=Latest is required +project_version.create_user.length_range=Create User length must be between {min} and {max} +project_version.create_user.not_blank=Create User is required +file_metadata.id.not_blank=ID is required +file_metadata.name.length_range=Name length must be between {min} and {max} +file_metadata.name.not_blank=Name is required +file_metadata.storage.length_range=Storage length must be between {min} and {max} +file_metadata.storage.not_blank=Storage is required +functional_case_template_extend.id.not_blank=ID is required +functional_case_template_extend.step_model.length_range=Step Model length must be between {min} and {max} +functional_case_template_extend.step_model.not_blank=Step Model is required diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties index e69de29bb2..2235255e8b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties @@ -0,0 +1,92 @@ +fake_error.id.not_blank=ID不能为空 +fake_error.project_id.length_range=项目ID长度必须在{min}-{max}之间 +fake_error.project_id.not_blank=项目ID不能为空 +fake_error.create_user.length_range=创建人长度必须在{min}-{max}之间 +fake_error.create_user.not_blank=创建人不能为空 +fake_error.update_user.length_range=更新人长度必须在{min}-{max}之间 +fake_error.update_user.not_blank=更新人不能为空 +fake_error.error_code.length_range=错误码长度必须在{min}-{max}之间 +fake_error.error_code.not_blank=错误码不能为空 +fake_error.match_type.length_range=匹配类型长度必须在{min}-{max}之间 +fake_error.match_type.not_blank=匹配类型不能为空 +issue_template_extend.id.not_blank=ID不能为空 +project_application.project_id.not_blank=项目ID不能为空 +project_application.type.not_blank=类型不能为空 +custom_function_blob.id.not_blank=ID不能为空 +fake_error_blob.id.not_blank=ID不能为空 +file_module.id.not_blank=ID不能为空 +file_module.project_id.length_range=项目ID长度必须在{min}-{max}之间 +file_module.project_id.not_blank=项目ID不能为空 +file_module.name.length_range=名称长度必须在{min}-{max}之间 +file_module.name.not_blank=名称不能为空 +custom_field_template.id.not_blank=ID不能为空 +custom_field_template.field_id.length_range=字段ID长度必须在{min}-{max}之间 +custom_field_template.field_id.not_blank=字段ID不能为空 +custom_field_template.template_id.length_range=模板ID长度必须在{min}-{max}之间 +custom_field_template.template_id.not_blank=模板ID不能为空 +custom_field_template.scene.length_range=场景长度必须在{min}-{max}之间 +custom_field_template.scene.not_blank=场景不能为空 +file_metadata_blob.id.not_blank=ID不能为空 +issue_template.id.not_blank=ID不能为空 +issue_template.name.length_range=名称长度必须在{min}-{max}之间 +issue_template.name.not_blank=名称不能为空 +issue_template.create_user.length_range=创建人长度必须在{min}-{max}之间 +issue_template.create_user.not_blank=创建人不能为空 +issue_template.project_id.length_range=项目ID长度必须在{min}-{max}之间 +issue_template.project_id.not_blank=项目ID不能为空 +functional_case_template.id.not_blank=ID不能为空 +functional_case_template.name.length_range=名称长度必须在{min}-{max}之间 +functional_case_template.name.not_blank=名称不能为空 +functional_case_template.create_user.length_range=创建人长度必须在{min}-{max}之间 +functional_case_template.create_user.not_blank=创建人不能为空 +functional_case_template.project_id.length_range=项目ID长度必须在{min}-{max}之间 +functional_case_template.project_id.not_blank=项目ID不能为空 +api_template.id.not_blank=ID不能为空 +api_template.name.length_range=名称长度必须在{min}-{max}之间 +api_template.name.not_blank=名称不能为空 +api_template.system.length_range=是否是系统字段长度必须在{min}-{max}之间 +api_template.system.not_blank=是否是系统字段不能为空 +api_template.global.length_range=是否是全局字段长度必须在{min}-{max}之间 +api_template.global.not_blank=是否是全局字段不能为空 +project_extend.project_id.not_blank=项目ID不能为空 +project_extend.platform.length_range=平台长度必须在{min}-{max}之间 +project_extend.platform.not_blank=平台不能为空 +project.id.not_blank=ID不能为空 +project.workspace_id.length_range=工作空间ID长度必须在{min}-{max}之间 +project.workspace_id.not_blank=工作空间ID不能为空 +project.name.length_range=名称长度必须在{min}-{max}之间 +project.name.not_blank=名称不能为空 +custom_function.id.not_blank=ID不能为空 +custom_function.name.length_range=名称长度必须在{min}-{max}之间 +custom_function.name.not_blank=名称不能为空 +custom_function.type.length_range=类型长度必须在{min}-{max}之间 +custom_function.type.not_blank=类型不能为空 +custom_function.create_user.length_range=创建人长度必须在{min}-{max}之间 +custom_function.create_user.not_blank=创建人不能为空 +custom_function.project_id.length_range=项目ID长度必须在{min}-{max}之间 +custom_function.project_id.not_blank=项目ID不能为空 +custom_field.id.not_blank=ID不能为空 +custom_field.name.length_range=名称长度必须在{min}-{max}之间 +custom_field.name.not_blank=名称不能为空 +custom_field.scene.length_range=场景长度必须在{min}-{max}之间 +custom_field.scene.not_blank=场景不能为空 +custom_field.type.length_range=类型长度必须在{min}-{max}之间 +custom_field.type.not_blank=类型不能为空 +file_module_blob.file_module_id.not_blank=文件模块ID不能为空 +project_version.id.not_blank=ID不能为空 +project_version.project_id.length_range=项目ID长度必须在{min}-{max}之间 +project_version.project_id.not_blank=项目ID不能为空 +project_version.name.length_range=名称长度必须在{min}-{max}之间 +project_version.name.not_blank=名称不能为空 +project_version.latest.length_range=最新版本长度必须在{min}-{max}之间 +project_version.latest.not_blank=最新版本不能为空 +project_version.create_user.length_range=创建人长度必须在{min}-{max}之间 +project_version.create_user.not_blank=创建人不能为空 +file_metadata.id.not_blank=ID不能为空 +file_metadata.name.length_range=名称长度必须在{min}-{max}之间 +file_metadata.name.not_blank=名称不能为空 +file_metadata.storage.length_range=存储长度必须在{min}-{max}之间 +file_metadata.storage.not_blank=存储不能为空 +functional_case_template_extend.id.not_blank=ID不能为空 +functional_case_template_extend.step_model.length_range=步骤模型长度必须在{min}-{max}之间 +functional_case_template_extend.step_model.not_blank=步骤模型不能为空 diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties index e69de29bb2..0d5b4df04d 100644 --- a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties @@ -0,0 +1,92 @@ +fake_error.id.not_blank=ID不能為空 +fake_error.project_id.length_range=項目ID長度必須在{min}-{max}之間 +fake_error.project_id.not_blank=項目ID不能為空 +fake_error.create_user.length_range=創建人長度必須在{min}-{max}之間 +fake_error.create_user.not_blank=創建人不能為空 +fake_error.update_user.length_range=更新人長度必須在{min}-{max}之間 +fake_error.update_user.not_blank=更新人不能為空 +fake_error.error_code.length_range=錯誤碼長度必須在{min}-{max}之間 +fake_error.error_code.not_blank=錯誤碼不能為空 +fake_error.match_type.length_range=匹配類型長度必須在{min}-{max}之間 +fake_error.match_type.not_blank=匹配類型不能為空 +issue_template_extend.id.not_blank=ID不能為空 +project_application.project_id.not_blank=項目ID不能為空 +project_application.type.not_blank=類型不能為空 +custom_function_blob.id.not_blank=ID不能為空 +fake_error_blob.id.not_blank=ID不能為空 +file_module.id.not_blank=ID不能為空 +file_module.project_id.length_range=項目ID長度必須在{min}-{max}之間 +file_module.project_id.not_blank=項目ID不能為空 +file_module.name.length_range=名稱長度必須在{min}-{max}之間 +file_module.name.not_blank=名稱不能為空 +custom_field_template.id.not_blank=ID不能為空 +custom_field_template.field_id.length_range=字段ID長度必須在{min}-{max}之間 +custom_field_template.field_id.not_blank=字段ID不能為空 +custom_field_template.template_id.length_range=模板ID長度必須在{min}-{max}之間 +custom_field_template.template_id.not_blank=模板ID不能為空 +custom_field_template.scene.length_range=場景長度必須在{min}-{max}之間 +custom_field_template.scene.not_blank=場景不能為空 +file_metadata_blob.id.not_blank=ID不能為空 +issue_template.id.not_blank=ID不能為空 +issue_template.name.length_range=名稱長度必須在{min}-{max}之間 +issue_template.name.not_blank=名稱不能為空 +issue_template.create_user.length_range=創建人長度必須在{min}-{max}之間 +issue_template.create_user.not_blank=創建人不能為空 +issue_template.project_id.length_range=項目ID長度必須在{min}-{max}之間 +issue_template.project_id.not_blank=項目ID不能為空 +functional_case_template.id.not_blank=ID不能為空 +functional_case_template.name.length_range=名稱長度必須在{min}-{max}之間 +functional_case_template.name.not_blank=名稱不能為空 +functional_case_template.create_user.length_range=創建人長度必須在{min}-{max}之間 +functional_case_template.create_user.not_blank=創建人不能為空 +functional_case_template.project_id.length_range=項目ID長度必須在{min}-{max}之間 +functional_case_template.project_id.not_blank=項目ID不能為空 +api_template.id.not_blank=ID不能為空 +api_template.name.length_range=名稱長度必須在{min}-{max}之間 +api_template.name.not_blank=名稱不能為空 +api_template.system.length_range=是否是系統字段長度必須在{min}-{max}之間 +api_template.system.not_blank=是否是系統字段不能為空 +api_template.global.length_range=是否是全局字段長度必須在{min}-{max}之間 +api_template.global.not_blank=是否是全局字段不能為空 +project_extend.project_id.not_blank=項目ID不能為空 +project_extend.platform.length_range=平台長度必須在{min}-{max}之間 +project_extend.platform.not_blank=平台不能為空 +project.id.not_blank=ID不能為空 +project.workspace_id.length_range=工作空間ID長度必須在{min}-{max}之間 +project.workspace_id.not_blank=工作空間ID不能為空 +project.name.length_range=名稱長度必須在{min}-{max}之間 +project.name.not_blank=名稱不能為空 +custom_function.id.not_blank=ID不能為空 +custom_function.name.length_range=名稱長度必須在{min}-{max}之間 +custom_function.name.not_blank=名稱不能為空 +custom_function.type.length_range=類型長度必須在{min}-{max}之間 +custom_function.type.not_blank=類型不能為空 +custom_function.create_user.length_range=創建人長度必須在{min}-{max}之間 +custom_function.create_user.not_blank=創建人不能為空 +custom_function.project_id.length_range=項目ID長度必須在{min}-{max}之間 +custom_function.project_id.not_blank=項目ID不能為空 +custom_field.id.not_blank=ID不能為空 +custom_field.name.length_range=名稱長度必須在{min}-{max}之間 +custom_field.name.not_blank=名稱不能為空 +custom_field.scene.length_range=場景長度必須在{min}-{max}之間 +custom_field.scene.not_blank=場景不能為空 +custom_field.type.length_range=類型長度必須在{min}-{max}之間 +custom_field.type.not_blank=類型不能為空 +file_module_blob.file_module_id.not_blank=文件模塊ID不能為空 +project_version.id.not_blank=ID不能為空 +project_version.project_id.length_range=項目ID長度必須在{min}-{max}之間 +project_version.project_id.not_blank=項目ID不能為空 +project_version.name.length_range=名稱長度必須在{min}-{max}之間 +project_version.name.not_blank=名稱不能為空 +project_version.latest.length_range=最新版本長度必須在{min}-{max}之間 +project_version.latest.not_blank=最新版本不能為空 +project_version.create_user.length_range=創建人長度必須在{min}-{max}之間 +project_version.create_user.not_blank=創建人不能為空 +file_metadata.id.not_blank=ID不能為空 +file_metadata.name.length_range=名稱長度必須在{min}-{max}之間 +file_metadata.name.not_blank=名稱不能為空 +file_metadata.storage.length_range=存儲長度必須在{min}-{max}之間 +file_metadata.storage.not_blank=存儲不能為空 +functional_case_template_extend.id.not_blank=ID不能為空 +functional_case_template_extend.step_model.length_range=步驟模型長度必須在{min}-{max}之間 +functional_case_template_extend.step_model.not_blank=步驟模型不能為空 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties index 5b3ce4fa7f..838bb0bd4a 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties @@ -15,7 +15,7 @@ message_task.test_id.not_blank=Message task test id must not be blank message_task.test_id.length_range=Message task test id must be between {min} and {max} characters long message_task.project_id.not_blank=Message task project id must not be blank message_task.project_id.length_range=Message task project id must be between {min} and {max} characters long -message_task_blob.message_task_id.not_blank=Message task blob message task id must not be blank +message_task_blob.id.not_blank=Message task blob message task id must not be blank notification.id.not_blank=Notification id must not be blank notification.type.not_blank=Notification type must not be blank notification.type.length_range=Notification type must be between {min} and {max} characters long @@ -61,7 +61,7 @@ plugin.source_name.not_blank=Plugin source name must not be blank plugin.source_name.length_range=Plugin source name must be between {min} and {max} characters long plugin.scenario.not_blank=Plugin scenario must not be blank plugin.scenario.length_range=Plugin scenario must be between {min} and {max} characters long -plugin_blob.plugin_id.not_blank=Plugin blob plugin id must not be blank +plugin_blob.id.not_blank=Plugin blob plugin id must not be blank quota.id.not_blank=Quota id must not be blank schedule.id.not_blank=Schedule id must not be blank schedule.type.not_blank=Schedule type must not be blank @@ -101,7 +101,7 @@ user.source.not_blank=User source must not be blank user.source.length_range=User source must be between {min} and {max} characters long user.create_user.not_blank=User create user must not be blank user.create_user.length_range=User create user must be between {min} and {max} characters long -user_extend.user_id.not_blank=User extend user id must not be blank +user_extend.id.not_blank=User extend user id must not be blank user_key.id.not_blank=User key id must not be blank user_key.create_user.not_blank=User key create user must not be blank user_key.create_user.length_range=User key create user must be between {min} and {max} characters long diff --git a/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties index e1b7480cf1..721e7dcd5c 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties @@ -15,7 +15,7 @@ message_task.test_id.not_blank=消息通知任务测试ID不能为空 message_task.test_id.length_range=消息通知任务测试ID长度必须在{min}和{max}之间 message_task.project_id.not_blank=消息通知任务项目ID不能为空 message_task.project_id.length_range=消息通知任务项目ID长度必须在{min}和{max}之间 -message_task_blob.message_task_id.not_blank=消息通知任务ID不能为空 +message_task_blob.id.not_blank=消息通知任务ID不能为空 notification.id.not_blank=消息通知ID不能为空 notification.type.not_blank=消息通知类型不能为空 notification.type.length_range=消息通知类型长度必须在{min}和{max}之间 @@ -61,7 +61,7 @@ plugin.source_name.not_blank=插件源名称不能为空 plugin.source_name.length_range=插件源名称长度必须在{min}和{max}之间 plugin.scenario.not_blank=插件场景不能为空 plugin.scenario.length_range=插件场景长度必须在{min}和{max}之间 -plugin_blob.plugin_id.not_blank=插件ID不能为空 +plugin_blob.id.not_blank=插件ID不能为空 quota.id.not_blank=配额ID不能为空 schedule.id.not_blank=定时任务ID不能为空 schedule.type.not_blank=定时任务类型不能为空 @@ -101,7 +101,7 @@ user.source.not_blank=用户来源不能为空 user.source.length_range=用户来源长度必须在{min}和{max}之间 user.create_user.not_blank=用户创建人不能为空 user.create_user.length_range=用户创建人长度必须在{min}和{max}之间 -user_extend.user_id.not_blank=用户ID不能为空 +user_extend.id.not_blank=用户ID不能为空 user_key.id.not_blank=用户ApiKey ID不能为空 user_key.create_user.not_blank=用户ApiKey创建人不能为空 user_key.create_user.length_range=用户ApiKey创建人长度必须在{min}和{max}之间 diff --git a/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties index bb50e320be..4c0060e4cf 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties @@ -15,7 +15,7 @@ message_task.test_id.not_blank=消息通知任務測試ID不能為空 message_task.test_id.length_range=消息通知任務測試ID長度必須在{min}和{max}之間 message_task.project_id.not_blank=消息通知任務項目ID不能為空 message_task.project_id.length_range=消息通知任務項目ID長度必須在{min}和{max}之間 -message_task_blob.message_task_id.not_blank=消息通知任務ID不能為空 +message_task_blob.id.not_blank=消息通知任務ID不能為空 notification.id.not_blank=消息通知ID不能為空 notification.type.not_blank=消息通知類型不能為空 notification.type.length_range=消息通知類型長度必須在{min}和{max}之間 @@ -61,7 +61,7 @@ plugin.source_name.not_blank=插件源名稱不能為空 plugin.source_name.length_range=插件源名稱長度必須在{min}和{max}之間 plugin.scenario.not_blank=插件場景不能為空 plugin.scenario.length_range=插件場景長度必須在{min}和{max}之間 -plugin_blob.plugin_id.not_blank=插件ID不能為空 +plugin_blob.id.not_blank=插件ID不能為空 quota.id.not_blank=配額ID不能為空 schedule.id.not_blank=定時任務ID不能為空 schedule.type.not_blank=定時任務類型不能為空 @@ -101,7 +101,7 @@ user.source.not_blank=用戶來源不能為空 user.source.length_range=用戶來源長度必須在{min}和{max}之間 user.create_user.not_blank=用戶創建人不能為空 user.create_user.length_range=用戶創建人長度必須在{min}和{max}之間 -user_extend.user_id.not_blank=用戶ID不能為空 +user_extend.id.not_blank=用戶ID不能為空 user_key.id.not_blank=用戶ApiKey ID不能為空 user_key.create_user.not_blank=用戶ApiKey創建人不能為空 user_key.create_user.length_range=用戶ApiKey創建人長度必須在{min}和{max}之間