diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java index be5e70e68e..a9d3b952dd 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/Environment.java @@ -10,46 +10,48 @@ import lombok.Data; @Data public class Environment implements Serializable { - @Schema(title = "Api Test Environment ID", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "环境ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{environment.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{environment.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "Api Test Environment Name", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "环境名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{environment.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{environment.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{environment.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(title = "Project ID", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{environment.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{environment.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "Api Test Protocol") + @Schema(title = "协议") private String protocol; - @Schema(title = "Api Test Socket") + @Schema(title = "") private String socket; - @Schema(title = "Api Test Domain") + @Schema(title = "域名/IP") private String domain; - @Schema(title = "Api Test Port") + @Schema(title = "端口") private Integer port; - @Schema(title = "") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{environment.create_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{environment.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "") + @Schema(title = "创建时间") private Long createTime; - @Schema(title = "") + @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "Global ariables") + @Schema(title = "全局变量") private String variables; - @Schema(title = "Global Heards") + @Schema(title = "请求头") private String headers; @Schema(title = "Config Data (JSON format)") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java index d42e8d2ac2..c078a338cd 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroup.java @@ -17,18 +17,20 @@ public class EnvironmentGroup implements Serializable { @Schema(title = "环境组名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{environment_group.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{environment_group.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{environment_group.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "所属工作空间", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{environment_group.workspace_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{environment_group.workspace_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{environment_group.workspace_id.length_range}", groups = {Created.class, Updated.class}) private String workspaceId; @Schema(title = "环境组描述") private String description; - @Schema(title = "创建人") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{environment_group.create_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{environment_group.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java index b1006802c5..3ffec419d7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/EnvironmentGroupProject.java @@ -18,7 +18,7 @@ public class EnvironmentGroupProject implements Serializable { @Schema(title = "环境组id") private String environmentGroupId; - @Schema(title = "api test environment 环境ID") + @Schema(title = "环境ID") private String environmentId; @Schema(title = "项目id") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java index f95906cb88..f2b6578482 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ExecutionQueue.java @@ -15,16 +15,24 @@ public class ExecutionQueue implements Serializable { @Size(min = 1, max = 50, message = "{execution_queue.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "集合报告/测试计划报告") + @Schema(title = "集合报告/测试计划报告", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{execution_queue.report_id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{execution_queue.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; - @Schema(title = "报告类型/计划报告/单独报告") + @Schema(title = "报告类型/计划报告/单独报告", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{execution_queue.report_type.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{execution_queue.report_type.length_range}", groups = {Created.class, Updated.class}) private String reportType; - @Schema(title = "执行模式/scenario/api/test_paln_api/test_pan_scenario") + @Schema(title = "执行模式/scenario/api/test_paln_api/test_pan_scenario", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{execution_queue.run_mode.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 100, message = "{execution_queue.run_mode.length_range}", groups = {Created.class, Updated.class}) private String runMode; - @Schema(title = "执行资源池") + @Schema(title = "执行资源池", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{execution_queue.pool_id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{execution_queue.pool_id.length_range}", groups = {Created.class, Updated.class}) private String poolId; @Schema(title = "创建时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java index 037771338f..b7aba8272b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdge.java @@ -31,9 +31,9 @@ public class RelationshipEdge implements Serializable { private String graphId; @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{relationship_edge.creator.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{relationship_edge.creator.length_range}", groups = {Created.class, Updated.class}) - private String creator; + @NotBlank(message = "{relationship_edge.create_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{relationship_edge.create_user.length_range}", groups = {Created.class, Updated.class}) + private String createUser; @Schema(title = "") private Long createTime; diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdgeExample.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdgeExample.java index becfe2c5eb..9bbdecb8f8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdgeExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/RelationshipEdgeExample.java @@ -384,73 +384,73 @@ public class RelationshipEdgeExample { return (Criteria) this; } - public Criteria andCreatorIsNull() { - addCriterion("creator is null"); + public Criteria andCreateUserIsNull() { + addCriterion("create_user is null"); return (Criteria) this; } - public Criteria andCreatorIsNotNull() { - addCriterion("creator is not null"); + public Criteria andCreateUserIsNotNull() { + addCriterion("create_user is not null"); return (Criteria) this; } - public Criteria andCreatorEqualTo(String value) { - addCriterion("creator =", value, "creator"); + public Criteria andCreateUserEqualTo(String value) { + addCriterion("create_user =", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorNotEqualTo(String value) { - addCriterion("creator <>", value, "creator"); + public Criteria andCreateUserNotEqualTo(String value) { + addCriterion("create_user <>", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorGreaterThan(String value) { - addCriterion("creator >", value, "creator"); + public Criteria andCreateUserGreaterThan(String value) { + addCriterion("create_user >", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorGreaterThanOrEqualTo(String value) { - addCriterion("creator >=", value, "creator"); + public Criteria andCreateUserGreaterThanOrEqualTo(String value) { + addCriterion("create_user >=", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorLessThan(String value) { - addCriterion("creator <", value, "creator"); + public Criteria andCreateUserLessThan(String value) { + addCriterion("create_user <", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorLessThanOrEqualTo(String value) { - addCriterion("creator <=", value, "creator"); + public Criteria andCreateUserLessThanOrEqualTo(String value) { + addCriterion("create_user <=", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorLike(String value) { - addCriterion("creator like", value, "creator"); + public Criteria andCreateUserLike(String value) { + addCriterion("create_user like", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorNotLike(String value) { - addCriterion("creator not like", value, "creator"); + public Criteria andCreateUserNotLike(String value) { + addCriterion("create_user not like", value, "createUser"); return (Criteria) this; } - public Criteria andCreatorIn(List values) { - addCriterion("creator in", values, "creator"); + public Criteria andCreateUserIn(List values) { + addCriterion("create_user in", values, "createUser"); return (Criteria) this; } - public Criteria andCreatorNotIn(List values) { - addCriterion("creator not in", values, "creator"); + public Criteria andCreateUserNotIn(List values) { + addCriterion("create_user not in", values, "createUser"); return (Criteria) this; } - public Criteria andCreatorBetween(String value1, String value2) { - addCriterion("creator between", value1, value2, "creator"); + public Criteria andCreateUserBetween(String value1, String value2) { + addCriterion("create_user between", value1, value2, "createUser"); return (Criteria) this; } - public Criteria andCreatorNotBetween(String value1, String value2) { - addCriterion("creator not between", value1, value2, "creator"); + public Criteria andCreateUserNotBetween(String value1, String value2) { + addCriterion("create_user not between", value1, value2, "createUser"); return (Criteria) this; } diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java index ae1e7c63ea..36aacdecb6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/domain/ShareInfo.java @@ -18,7 +18,9 @@ public class ShareInfo implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{share_info.create_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{share_info.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; @Schema(title = "更新时间") diff --git a/backend/framework/domain/src/main/java/io/metersphere/sdk/mapper/RelationshipEdgeMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/sdk/mapper/RelationshipEdgeMapper.xml index f2464cbfef..b473938b2d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/sdk/mapper/RelationshipEdgeMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/sdk/mapper/RelationshipEdgeMapper.xml @@ -6,7 +6,7 @@ - + @@ -68,7 +68,7 @@ - source_id, target_id, `type`, graph_id, creator, create_time + source_id, target_id, `type`, graph_id, create_user, create_time