From 0b89e84917f93f481426128de1256d546ebacd5a Mon Sep 17 00:00:00 2001 From: CaptainB Date: Thu, 25 May 2023 19:52:57 +0800 Subject: [PATCH] build: swagger v3 --- .../io/metersphere/load/domain/LoadTest.java | 22 +++++----- .../metersphere/load/domain/LoadTestApi.java | 8 ++-- .../metersphere/load/domain/LoadTestBlob.java | 2 +- .../metersphere/load/domain/LoadTestFile.java | 6 +-- .../load/domain/LoadTestFollow.java | 4 +- .../load/domain/LoadTestReport.java | 20 ++++----- .../load/domain/LoadTestReportBlob.java | 2 +- .../load/domain/LoadTestReportFile.java | 6 +-- .../load/domain/LoadTestReportLog.java | 6 +-- .../load/domain/LoadTestReportResult.java | 4 +- .../load/domain/LoadTestReportResultPart.java | 6 +-- .../domain/LoadTestReportResultRealtime.java | 8 ++-- .../project/domain/ApiTemplate.java | 10 ++--- .../project/domain/CustomField.java | 10 ++--- .../project/domain/CustomFieldTemplate.java | 8 ++-- .../project/domain/CustomFunction.java | 4 +- .../project/domain/CustomFunctionBlob.java | 2 +- .../metersphere/project/domain/FakeError.java | 12 +++--- .../project/domain/FakeErrorBlob.java | 2 +- .../project/domain/FileMetadata.java | 8 ++-- .../project/domain/FileMetadataBlob.java | 2 +- .../project/domain/FileModule.java | 6 +-- .../project/domain/FileModuleBlob.java | 2 +- .../domain/FunctionalCaseTemplate.java | 10 ++--- .../domain/FunctionalCaseTemplateExtend.java | 4 +- .../project/domain/IssueTemplate.java | 10 ++--- .../project/domain/IssueTemplateExtend.java | 2 +- .../metersphere/project/domain/Project.java | 6 +-- .../project/domain/ProjectApplication.java | 4 +- .../project/domain/ProjectExtend.java | 4 +- .../project/domain/ProjectVersion.java | 10 ++--- .../metersphere/system/domain/AuthSource.java | 6 +-- .../io/metersphere/system/domain/License.java | 2 +- .../system/domain/MessageTask.java | 14 +++---- .../system/domain/MessageTaskBlob.java | 2 +- .../system/domain/Notification.java | 20 ++++----- .../system/domain/NoviceStatistics.java | 6 +-- .../system/domain/OperatingLog.java | 6 +-- .../system/domain/OperatingLogResource.java | 6 +-- .../io/metersphere/system/domain/Plugin.java | 16 +++---- .../metersphere/system/domain/PluginBlob.java | 2 +- .../io/metersphere/system/domain/Quota.java | 2 +- .../metersphere/system/domain/Schedule.java | 10 ++--- .../system/domain/ServiceIntegration.java | 6 +-- .../system/domain/SystemParameter.java | 4 +- .../system/domain/TestResource.java | 6 +-- .../system/domain/TestResourcePool.java | 8 ++-- .../io/metersphere/system/domain/User.java | 12 +++--- .../metersphere/system/domain/UserExtend.java | 2 +- .../io/metersphere/system/domain/UserKey.java | 8 ++-- .../metersphere/system/domain/UserRole.java | 12 +++--- .../system/domain/UserRolePermission.java | 8 ++-- .../system/domain/UserRoleRelation.java | 8 ++-- .../metersphere/system/domain/Workspace.java | 6 +-- .../src/main/resources/generatorConfig.xml | 42 ++++++++++++------- 55 files changed, 217 insertions(+), 207 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java index 2785d59403..fe1ef24165 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTest implements Serializable { - @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{load_test.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "测试名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "测试名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{load_test.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -34,42 +34,42 @@ public class LoadTest implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "状态: Starting, Running, Completed, Error, etc.", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "状态: Starting, Running, Completed, Error, etc.", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test.status.length_range}", groups = {Created.class, Updated.class}) private String status; - @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.test_resource_pool_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test.test_resource_pool_id.length_range}", groups = {Created.class, Updated.class}) private String testResourcePoolId; - @Schema(title = "测试数字ID，例如: 100001", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "测试数字ID，例如: 100001", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.num.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test.num.length_range}", groups = {Created.class, Updated.class}) private Integer num; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{load_test.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "自定义排序，间隔5000", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 19]") + @Schema(title = "自定义排序，间隔5000", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.pos.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 19, message = "{load_test.pos.length_range}", groups = {Created.class, Updated.class}) private Long pos; - @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.version_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test.version_id.length_range}", groups = {Created.class, Updated.class}) private String versionId; - @Schema(title = "基版本数据ID，首条测试和测试ID相同", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "基版本数据ID，首条测试和测试ID相同", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.ref_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test.ref_id.length_range}", groups = {Created.class, Updated.class}) private String refId; - @Schema(title = "是否为最新版本 0:否，1:是", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否为最新版本 0:否，1:是", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.latest.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{load_test.latest.length_range}", groups = {Created.class, Updated.class}) private Boolean latest; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestApi.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestApi.java index 7cdabfbc5e..5035675913 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestApi.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestApi.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestApi implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_api.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{load_test_api.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "接口场景或用例ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "接口场景或用例ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_api.api_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{load_test_api.api_id.length_range}", groups = {Created.class, Updated.class}) private String apiId; - @Schema(title = "性能测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "性能测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_api.load_test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_api.load_test_id.length_range}", groups = {Created.class, Updated.class}) private String loadTestId; @@ -28,7 +28,7 @@ public class LoadTestApi implements Serializable { @Schema(title = "环境ID") private String envId; - @Schema(title = "类型: SCENARIO, CASE", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 20]") + @Schema(title = "类型: SCENARIO, CASE", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_api.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 20, message = "{load_test_api.type.length_range}", groups = {Created.class, Updated.class}) private String type; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java index 1ca10de142..169452046a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class LoadTestBlob implements Serializable { - @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_blob.test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_blob.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java index 04d5f5ed04..81697f9c56 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestFile implements Serializable { - @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_file.test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_file.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; - @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_file.file_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_file.file_id.length_range}", groups = {Created.class, Updated.class}) private String fileId; - @Schema(title = "文件排序", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "文件排序", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_file.sort.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test_file.sort.length_range}", groups = {Created.class, Updated.class}) private Integer sort; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFollow.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFollow.java index 1c58c6aba5..d9045485d8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFollow.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFollow.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class LoadTestFollow implements Serializable { - @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_follow.test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_follow.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; - @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_follow.follow_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_follow.follow_id.length_range}", groups = {Created.class, Updated.class}) private String followId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java index f8b8cd45a1..f52e875d1f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestReport implements Serializable { - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; - @Schema(title = "报告名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "报告名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -34,17 +34,17 @@ public class LoadTestReport implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "状态: Starting, Running, Error,Completed etc.", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "状态: Starting, Running, Error,Completed etc.", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report.status.length_range}", groups = {Created.class, Updated.class}) private String status; - @Schema(title = "创建人(执行人)ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "创建人(执行人)ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "触发方式", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "触发方式", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.trigger_mode.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report.trigger_mode.length_range}", groups = {Created.class, Updated.class}) private String triggerMode; @@ -58,17 +58,17 @@ public class LoadTestReport implements Serializable { @Schema(title = "每秒事务数") private String tps; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "测试名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "测试名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.test_name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report.test_name.length_range}", groups = {Created.class, Updated.class}) private String testName; - @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.test_resource_pool_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report.test_resource_pool_id.length_range}", groups = {Created.class, Updated.class}) private String testResourcePoolId; @@ -82,7 +82,7 @@ public class LoadTestReport implements Serializable { @Schema(title = "执行时长") private Long testDuration; - @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.version_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report.version_id.length_range}", groups = {Created.class, Updated.class}) private String versionId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java index eef4fbcaa6..7e50b92731 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class LoadTestReportBlob implements Serializable { - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_blob.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_blob.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportFile.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportFile.java index 3e45c312f0..a634ace6d8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportFile.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportFile.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestReportFile implements Serializable { - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_file.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_file.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; - @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_file.file_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_file.file_id.length_range}", groups = {Created.class, Updated.class}) private String fileId; - @Schema(title = "文件排序", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "文件排序", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_file.sort.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test_report_file.sort.length_range}", groups = {Created.class, Updated.class}) private Integer sort; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportLog.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportLog.java index 7c283e4ad7..c3cb4c9e5d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportLog.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportLog.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestReportLog implements Serializable { - @Schema(title = "主键无实际意义", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "主键无实际意义", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_log.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_log.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_log.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_log.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; - @Schema(title = "资源节点ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源节点ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_log.resource_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_log.resource_id.length_range}", groups = {Created.class, Updated.class}) private String resourceId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResult.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResult.java index 063630d705..81d102f1d9 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResult.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResult.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class LoadTestReportResult implements Serializable { - @Schema(title = "主键无实际意义", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "主键无实际意义", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_result.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_result.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultPart.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultPart.java index f336d73deb..51fafcf8a8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultPart.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultPart.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class LoadTestReportResultPart implements Serializable { - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_part.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_result_part.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; - @Schema(title = "报告项目key", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "报告项目key", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_part.report_key.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report_result_part.report_key.length_range}", groups = {Created.class, Updated.class}) private String reportKey; - @Schema(title = "资源节点索引号", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "资源节点索引号", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_part.resource_index.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test_report_result_part.resource_index.length_range}", groups = {Created.class, Updated.class}) private Integer resourceIndex; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultRealtime.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultRealtime.java index 1232376d14..2f547babe8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultRealtime.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportResultRealtime.java @@ -10,22 +10,22 @@ import lombok.Data; @Data public class LoadTestReportResultRealtime implements Serializable { - @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_realtime.report_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{load_test_report_result_realtime.report_id.length_range}", groups = {Created.class, Updated.class}) private String reportId; - @Schema(title = "报告项目key", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "报告项目key", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_realtime.report_key.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{load_test_report_result_realtime.report_key.length_range}", groups = {Created.class, Updated.class}) private String reportKey; - @Schema(title = "资源节点索引号", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "资源节点索引号", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_realtime.resource_index.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test_report_result_realtime.resource_index.length_range}", groups = {Created.class, Updated.class}) private Integer resourceIndex; - @Schema(title = "报告项目内容排序", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "报告项目内容排序", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report_result_realtime.sort.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{load_test_report_result_realtime.sort.length_range}", groups = {Created.class, Updated.class}) private Integer sort; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java index 401a1813b8..c83bd630eb 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class ApiTemplate implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{api_template.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{api_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -23,7 +23,7 @@ public class ApiTemplate implements Serializable { @Schema(title = "描述") private String description; - @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.system.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{api_template.system.length_range}", groups = {Created.class, Updated.class}) private Boolean system; @@ -31,12 +31,12 @@ public class ApiTemplate implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{api_template.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{api_template.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; 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 6ce572a985..202ca59ef4 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 @@ -10,22 +10,22 @@ import lombok.Data; @Data public class CustomField implements Serializable { - @Schema(title = "自定义字段ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "自定义字段ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 100, message = "{custom_field.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "自定义字段名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "自定义字段名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{custom_field.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.scene.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{custom_field.scene.length_range}", groups = {Created.class, Updated.class}) private String scene; - @Schema(title = "自定义字段类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "自定义字段类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{custom_field.type.length_range}", groups = {Created.class, Updated.class}) private String type; @@ -51,7 +51,7 @@ public class CustomField implements Serializable { @Schema(title = "项目ID") private String projectId; - @Schema(title = "是否关联第三方", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否关联第三方", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.third_part.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{custom_field.third_part.length_range}", groups = {Created.class, Updated.class}) private Boolean thirdPart; 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 3cd4371530..3b162f897c 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 @@ -10,22 +10,22 @@ import lombok.Data; @Data public class CustomFieldTemplate implements Serializable { - @Schema(title = "自定义模版ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "自定义模版ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field_template.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{custom_field_template.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "自定义字段ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "自定义字段ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field_template.field_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{custom_field_template.field_id.length_range}", groups = {Created.class, Updated.class}) private String fieldId; - @Schema(title = "模版ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "模版ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field_template.template_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{custom_field_template.template_id.length_range}", groups = {Created.class, Updated.class}) private String templateId; - @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field_template.scene.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{custom_field_template.scene.length_range}", groups = {Created.class, Updated.class}) private String scene; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunction.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunction.java index 2649faae0c..e2d7bfc05e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunction.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunction.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class CustomFunction implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_function.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{custom_function.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "函数名", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "函数名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_function.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{custom_function.name.length_range}", groups = {Created.class, Updated.class}) private String name; 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 7fc78e37b0..1591f0fcb1 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class CustomFunctionBlob implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_function_blob.function_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{custom_function_blob.function_id.length_range}", groups = {Created.class, Updated.class}) private String functionId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java index c894ed82d9..34783824bb 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class FakeError implements Serializable { - @Schema(title = "误报ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "误报ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{fake_error.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{fake_error.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; @@ -26,22 +26,22 @@ public class FakeError implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{fake_error.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "更新人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "更新人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.update_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{fake_error.update_user.length_range}", groups = {Created.class, Updated.class}) private String updateUser; - @Schema(title = "错误码", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "错误码", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.error_code.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{fake_error.error_code.length_range}", groups = {Created.class, Updated.class}) private String errorCode; - @Schema(title = "匹配类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "匹配类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error.match_type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{fake_error.match_type.length_range}", groups = {Created.class, Updated.class}) private String matchType; 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 f3c85c6b9a..0448a96a9e 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class FakeErrorBlob implements Serializable { - @Schema(title = "Test ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "Test ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{fake_error_blob.fake_error_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{fake_error_blob.fake_error_id.length_range}", groups = {Created.class, Updated.class}) private String fakeErrorId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java index 414726f404..68986ebf7e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class FileMetadata implements Serializable { - @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{file_metadata.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "文件名", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 250]") + @Schema(title = "文件名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 250, message = "{file_metadata.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -23,7 +23,7 @@ public class FileMetadata implements Serializable { @Schema(title = "文件类型") private String type; - @Schema(title = "文件大小", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 19]") + @Schema(title = "文件大小", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata.size.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 19, message = "{file_metadata.size.length_range}", groups = {Created.class, Updated.class}) private Long size; @@ -37,7 +37,7 @@ public class FileMetadata implements Serializable { @Schema(title = "项目ID") private String projectId; - @Schema(title = "文件存储方式", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "文件存储方式", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata.storage.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{file_metadata.storage.length_range}", groups = {Created.class, Updated.class}) private String storage; 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 ea1a3bf043..25eab7be91 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class FileMetadataBlob implements Serializable { - @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata_blob.file_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{file_metadata_blob.file_id.length_range}", groups = {Created.class, Updated.class}) private String fileId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModule.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModule.java index 4c8730c85e..e61b45c23f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModule.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModule.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class FileModule implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_module.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{file_module.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_module.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{file_module.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_module.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{file_module.name.length_range}", groups = {Created.class, Updated.class}) private String name; 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 b296c4a9c4..a7edebc25f 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class FileModuleBlob implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_module_blob.file_module_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{file_module_blob.file_module_id.length_range}", groups = {Created.class, Updated.class}) private String fileModuleId; 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 index ad57b96f3a..12f21db9f0 100644 --- 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 @@ -10,12 +10,12 @@ import lombok.Data; @Data public class FunctionalCaseTemplate implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{functional_case_template.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{functional_case_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -23,7 +23,7 @@ public class FunctionalCaseTemplate implements Serializable { @Schema(title = "描述") private String description; - @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.system.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{functional_case_template.system.length_range}", groups = {Created.class, Updated.class}) private Boolean system; @@ -31,12 +31,12 @@ public class FunctionalCaseTemplate implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{functional_case_template.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{functional_case_template.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; 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 index 58aaed4bd0..ee02c727a9 100644 --- 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class FunctionalCaseTemplateExtend implements Serializable { - @Schema(title = "模板ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "模板ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template_extend.template_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{functional_case_template_extend.template_id.length_range}", groups = {Created.class, Updated.class}) private String templateId; @@ -18,7 +18,7 @@ public class FunctionalCaseTemplateExtend implements Serializable { @Schema(title = "用例名称模板") private String caseName; - @Schema(title = "编辑模式模板：步骤模式/文本模式", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "编辑模式模板：步骤模式/文本模式", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template_extend.step_model.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{functional_case_template_extend.step_model.length_range}", groups = {Created.class, Updated.class}) private String stepModel; 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 index 6b431c1cd1..84ab703146 100644 --- 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 @@ -10,12 +10,12 @@ import lombok.Data; @Data public class IssueTemplate implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{issue_template.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -23,7 +23,7 @@ public class IssueTemplate implements Serializable { @Schema(title = "描述") private String description; - @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.system.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{issue_template.system.length_range}", groups = {Created.class, Updated.class}) private Boolean system; @@ -31,12 +31,12 @@ public class IssueTemplate implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{issue_template.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{issue_template.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; 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 index 5d2d4f30bc..9f8f538ad0 100644 --- 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class IssueTemplateExtend implements Serializable { - @Schema(title = "缺陷模板ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "缺陷模板ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template_extend.template_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{issue_template_extend.template_id.length_range}", groups = {Created.class, Updated.class}) private String templateId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java index 01cf2df685..bde9e370fb 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class Project implements Serializable { - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{project.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "工作空间ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "工作空间ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project.workspace_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{project.workspace_id.length_range}", groups = {Created.class, Updated.class}) private String workspaceId; - @Schema(title = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{project.name.length_range}", groups = {Created.class, Updated.class}) private String name; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectApplication.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectApplication.java index 2355743b6f..d4e11afbc2 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectApplication.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectApplication.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class ProjectApplication implements Serializable { - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_application.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{project_application.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "配置项", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "配置项", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_application.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{project_application.type.length_range}", groups = {Created.class, Updated.class}) private String type; 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 fdfda344fc..4041a9157d 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class ProjectExtend implements Serializable { - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_extend.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{project_extend.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; @@ -33,7 +33,7 @@ public class ProjectExtend implements Serializable { @Schema(title = "azure 过滤需求的 parent workItem ID") private String azureFilterId; - @Schema(title = "项目使用哪个平台的模板", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 20]") + @Schema(title = "项目使用哪个平台的模板", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_extend.platform.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 20, message = "{project_extend.platform.length_range}", groups = {Created.class, Updated.class}) private String platform; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java index 5a265378b0..50300e041e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class ProjectVersion implements Serializable { - @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{project_version.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{project_version.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(title = "版本名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "版本名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{project_version.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -31,7 +31,7 @@ public class ProjectVersion implements Serializable { @Schema(title = "状态") private String status; - @Schema(title = "是否是最新版", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否是最新版", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.latest.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{project_version.latest.length_range}", groups = {Created.class, Updated.class}) private Boolean latest; @@ -48,7 +48,7 @@ public class ProjectVersion implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{project_version.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSource.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSource.java index f73813ed90..45eb34b8d6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSource.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSource.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class AuthSource implements Serializable { - @Schema(title = "认证源ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "认证源ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{auth_source.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{auth_source.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "状态 启用 禁用", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "状态 启用 禁用", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{auth_source.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{auth_source.status.length_range}", groups = {Created.class, Updated.class}) private String status; @@ -35,7 +35,7 @@ public class AuthSource implements Serializable { @Schema(title = "类型") private String type; - @Schema(title = "认证源配置", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 65535]") + @Schema(title = "认证源配置", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{auth_source.configuration.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 65535, message = "{auth_source.configuration.length_range}", groups = {Created.class, Updated.class}) private byte[] configuration; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/License.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/License.java index 76df44a617..4737c3c4e0 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/License.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/License.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class License implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{license.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{license.id.length_range}", groups = {Created.class, Updated.class}) private String id; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java index f925d60a50..4b8ccafc2b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/MessageTask.java @@ -10,27 +10,27 @@ import lombok.Data; @Data public class MessageTask implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 255, message = "{message_task.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{message_task.type.length_range}", groups = {Created.class, Updated.class}) private String type; - @Schema(title = "通知事件类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "通知事件类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.event.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{message_task.event.length_range}", groups = {Created.class, Updated.class}) private String event; - @Schema(title = "接收人id", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "接收人id", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.receiver.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{message_task.receiver.length_range}", groups = {Created.class, Updated.class}) private String receiver; - @Schema(title = "任务类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "任务类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.task_type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{message_task.task_type.length_range}", groups = {Created.class, Updated.class}) private String taskType; @@ -38,7 +38,7 @@ public class MessageTask implements Serializable { @Schema(title = "webhook地址") private String webhook; - @Schema(title = "具体测试的ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "具体测试的ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.test_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{message_task.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; @@ -46,7 +46,7 @@ public class MessageTask implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{message_task.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; 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 80e3e497fc..1975b07e19 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class MessageTaskBlob implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{message_task_blob.message_task_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{message_task_blob.message_task_id.length_range}", groups = {Created.class, Updated.class}) private String messageTaskId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java index 884da1386c..83008bf4e7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Notification.java @@ -10,27 +10,27 @@ import lombok.Data; @Data public class Notification implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 19]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 19, message = "{notification.id.length_range}", groups = {Created.class, Updated.class}) private Long id; - @Schema(title = "通知类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "通知类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{notification.type.length_range}", groups = {Created.class, Updated.class}) private String type; - @Schema(title = "接收人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "接收人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.receiver.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{notification.receiver.length_range}", groups = {Created.class, Updated.class}) private String receiver; - @Schema(title = "标题", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "标题", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.title.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{notification.title.length_range}", groups = {Created.class, Updated.class}) private String title; - @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{notification.status.length_range}", groups = {Created.class, Updated.class}) private String status; @@ -38,27 +38,27 @@ public class Notification implements Serializable { @Schema(title = "创建时间") private Long createTime; - @Schema(title = "操作人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "操作人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.operator.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{notification.operator.length_range}", groups = {Created.class, Updated.class}) private String operator; - @Schema(title = "操作", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "操作", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.operation.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{notification.operation.length_range}", groups = {Created.class, Updated.class}) private String operation; - @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.resource_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{notification.resource_id.length_range}", groups = {Created.class, Updated.class}) private String resourceId; - @Schema(title = "资源类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.resource_type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{notification.resource_type.length_range}", groups = {Created.class, Updated.class}) private String resourceType; - @Schema(title = "资源名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "资源名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{notification.resource_name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{notification.resource_name.length_range}", groups = {Created.class, Updated.class}) private String resourceName; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/NoviceStatistics.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/NoviceStatistics.java index 63bb3e02ae..83badf27a8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/NoviceStatistics.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/NoviceStatistics.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class NoviceStatistics implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{novice_statistics.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{novice_statistics.id.length_range}", groups = {Created.class, Updated.class}) private String id; @@ -18,12 +18,12 @@ public class NoviceStatistics implements Serializable { @Schema(title = "用户id") private String userId; - @Schema(title = "新手引导完成的步骤", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "新手引导完成的步骤", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{novice_statistics.guide_step.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{novice_statistics.guide_step.length_range}", groups = {Created.class, Updated.class}) private Boolean guideStep; - @Schema(title = "新手引导的次数", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 10]") + @Schema(title = "新手引导的次数", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{novice_statistics.guide_num.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 10, message = "{novice_statistics.guide_num.length_range}", groups = {Created.class, Updated.class}) private Integer guideNum; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLog.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLog.java index bfeeffc259..ef532ca4d6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLog.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLog.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class OperatingLog implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{operating_log.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log.project_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{operating_log.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; @@ -44,7 +44,7 @@ public class OperatingLog implements Serializable { @Schema(title = "操作路径") private String operPath; - @Schema(title = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 19]") + @Schema(title = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log.oper_time.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 19, message = "{operating_log.oper_time.length_range}", groups = {Created.class, Updated.class}) private Long operTime; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLogResource.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLogResource.java index 3d2c06aa58..aad7e45919 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLogResource.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/OperatingLogResource.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class OperatingLogResource implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log_resource.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{operating_log_resource.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "Operating log ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "Operating log ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log_resource.operating_log_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{operating_log_resource.operating_log_id.length_range}", groups = {Created.class, Updated.class}) private String operatingLogId; - @Schema(title = "operating source id", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "operating source id", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{operating_log_resource.source_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{operating_log_resource.source_id.length_range}", groups = {Created.class, Updated.class}) private String sourceId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Plugin.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Plugin.java index 9b04331105..2d75ecbf76 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Plugin.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Plugin.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class Plugin implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{plugin.id.length_range}", groups = {Created.class, Updated.class}) private String id; @@ -18,32 +18,32 @@ public class Plugin implements Serializable { @Schema(title = "plugin name") private String name; - @Schema(title = "Plugin id", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 300]") + @Schema(title = "Plugin id", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.plugin_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 300, message = "{plugin.plugin_id.length_range}", groups = {Created.class, Updated.class}) private String pluginId; - @Schema(title = "Ui script id", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 300]") + @Schema(title = "Ui script id", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.script_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 300, message = "{plugin.script_id.length_range}", groups = {Created.class, Updated.class}) private String scriptId; - @Schema(title = "Plugin clazzName", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 500]") + @Schema(title = "Plugin clazzName", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.clazz_name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 500, message = "{plugin.clazz_name.length_range}", groups = {Created.class, Updated.class}) private String clazzName; - @Schema(title = "Jmeter base clazzName", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 300]") + @Schema(title = "Jmeter base clazzName", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.jmeter_clazz.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 300, message = "{plugin.jmeter_clazz.length_range}", groups = {Created.class, Updated.class}) private String jmeterClazz; - @Schema(title = "Plugin jar path", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 300]") + @Schema(title = "Plugin jar path", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.source_path.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 300, message = "{plugin.source_path.length_range}", groups = {Created.class, Updated.class}) private String sourcePath; - @Schema(title = "Plugin jar name", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 300]") + @Schema(title = "Plugin jar name", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.source_name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 300, message = "{plugin.source_name.length_range}", groups = {Created.class, Updated.class}) private String sourceName; @@ -63,7 +63,7 @@ public class Plugin implements Serializable { @Schema(title = "Is xpack plugin") private Boolean xpack; - @Schema(title = "Plugin usage scenarios", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "Plugin usage scenarios", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin.scenario.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{plugin.scenario.length_range}", groups = {Created.class, Updated.class}) private String scenario; 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 1673fef8c8..f5c2b429bd 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class PluginBlob implements Serializable { - @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{plugin_blob.plugin_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{plugin_blob.plugin_id.length_range}", groups = {Created.class, Updated.class}) private String pluginId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Quota.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Quota.java index 97de394cb6..c40e6f025d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Quota.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Quota.java @@ -11,7 +11,7 @@ import lombok.Data; @Data public class Quota implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{quota.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{quota.id.length_range}", groups = {Created.class, Updated.class}) private String id; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Schedule.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Schedule.java index 22b1b55726..845a85c680 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Schedule.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Schedule.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class Schedule implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{schedule.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{schedule.id.length_range}", groups = {Created.class, Updated.class}) private String id; @@ -18,17 +18,17 @@ public class Schedule implements Serializable { @Schema(title = "qrtz UUID") private String key; - @Schema(title = "资源类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{schedule.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{schedule.type.length_range}", groups = {Created.class, Updated.class}) private String type; - @Schema(title = "Schedule value", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 255]") + @Schema(title = "Schedule value", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{schedule.value.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 255, message = "{schedule.value.length_range}", groups = {Created.class, Updated.class}) private String value; - @Schema(title = "Schedule Job Class Name", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "Schedule Job Class Name", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{schedule.job.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{schedule.job.length_range}", groups = {Created.class, Updated.class}) private String job; @@ -39,7 +39,7 @@ public class Schedule implements Serializable { @Schema(title = "") private String resourceId; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{schedule.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{schedule.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/ServiceIntegration.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/ServiceIntegration.java index 199b5a5cf6..631bafb03a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/ServiceIntegration.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/ServiceIntegration.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class ServiceIntegration implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{service_integration.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{service_integration.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "平台", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "平台", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{service_integration.platform.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{service_integration.platform.length_range}", groups = {Created.class, Updated.class}) private String platform; @@ -23,7 +23,7 @@ public class ServiceIntegration implements Serializable { @Schema(title = "工作空间ID") private String workspaceId; - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 65535]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{service_integration.configuration.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 65535, message = "{service_integration.configuration.length_range}", groups = {Created.class, Updated.class}) private byte[] configuration; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/SystemParameter.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/SystemParameter.java index 63272b5398..57c9733182 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/SystemParameter.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/SystemParameter.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class SystemParameter implements Serializable { - @Schema(title = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "参数名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{system_parameter.param_key.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{system_parameter.param_key.length_range}", groups = {Created.class, Updated.class}) private String paramKey; @@ -18,7 +18,7 @@ public class SystemParameter implements Serializable { @Schema(title = "参数值") private String paramValue; - @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{system_parameter.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{system_parameter.type.length_range}", groups = {Created.class, Updated.class}) private String type; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java index 7d2635579c..c10ee89e55 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResource.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class TestResource implements Serializable { - @Schema(title = "资源节点ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源节点ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{test_resource.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource.test_resource_pool_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{test_resource.test_resource_pool_id.length_range}", groups = {Created.class, Updated.class}) private String testResourcePoolId; - @Schema(title = "资源节点状态", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "资源节点状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{test_resource.status.length_range}", groups = {Created.class, Updated.class}) private String status; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java index 7890637302..459f290518 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class TestResourcePool implements Serializable { - @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{test_resource_pool.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{test_resource_pool.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 30]") + @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 30, message = "{test_resource_pool.type.length_range}", groups = {Created.class, Updated.class}) private String type; @@ -28,7 +28,7 @@ public class TestResourcePool implements Serializable { @Schema(title = "描述") private String description; - @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{test_resource_pool.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class}) private String status; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java index 3c64016123..28f650ea72 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java @@ -10,17 +10,17 @@ import lombok.Data; @Data public class User implements Serializable { - @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{user.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "用户名", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "用户名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(title = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.email.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user.email.length_range}", groups = {Created.class, Updated.class}) private String email; @@ -28,7 +28,7 @@ public class User implements Serializable { @Schema(title = "用户密码") private String password; - @Schema(title = "用户状态，启用或禁用", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户状态，启用或禁用", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.status.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user.status.length_range}", groups = {Created.class, Updated.class}) private String status; @@ -48,7 +48,7 @@ public class User implements Serializable { @Schema(title = "手机号") private String phone; - @Schema(title = "来源：LOCAL OIDC CAS", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "来源：LOCAL OIDC CAS", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.source.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user.source.length_range}", groups = {Created.class, Updated.class}) private String source; @@ -56,7 +56,7 @@ public class User implements Serializable { @Schema(title = "当前项目ID") private String lastProjectId; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{user.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; 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 87d9f1b2ba..a523e2dfec 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 @@ -10,7 +10,7 @@ import lombok.Data; @Data public class UserExtend implements Serializable { - @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_extend.user_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_extend.user_id.length_range}", groups = {Created.class, Updated.class}) private String userId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserKey.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserKey.java index ff08ffdf65..13bdad01b7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserKey.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserKey.java @@ -10,22 +10,22 @@ import lombok.Data; @Data public class UserKey implements Serializable { - @Schema(title = "user_key ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "user_key ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_key.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{user_key.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_key.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_key.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "access_key", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "access_key", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_key.access_key.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_key.access_key.length_range}", groups = {Created.class, Updated.class}) private String accessKey; - @Schema(title = "secret key", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "secret key", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_key.secret_key.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_key.secret_key.length_range}", groups = {Created.class, Updated.class}) private String secretKey; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java index 590aba014f..925daa422d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class UserRole implements Serializable { - @Schema(title = "组ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "组ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{user_role.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "组名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "组名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user_role.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -23,12 +23,12 @@ public class UserRole implements Serializable { @Schema(title = "描述") private String description; - @Schema(title = "是否是系统用户组", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 1]") + @Schema(title = "是否是系统用户组", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.system.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 1, message = "{user_role.system.length_range}", groups = {Created.class, Updated.class}) private Boolean system; - @Schema(title = "所属类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 20]") + @Schema(title = "所属类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.type.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 20, message = "{user_role.type.length_range}", groups = {Created.class, Updated.class}) private String type; @@ -39,12 +39,12 @@ public class UserRole implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "创建人(操作人）", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "创建人(操作人）", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user_role.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "应用范围", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "应用范围", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role.scope_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user_role.scope_id.length_range}", groups = {Created.class, Updated.class}) private String scopeId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRolePermission.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRolePermission.java index 3d4d365432..e09502440c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRolePermission.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRolePermission.java @@ -10,22 +10,22 @@ import lombok.Data; @Data public class UserRolePermission implements Serializable { - @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_permission.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 64, message = "{user_role_permission.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "用户组ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "用户组ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_permission.role_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user_role_permission.role_id.length_range}", groups = {Created.class, Updated.class}) private String roleId; - @Schema(title = "权限ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 128]") + @Schema(title = "权限ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_permission.permission_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 128, message = "{user_role_permission.permission_id.length_range}", groups = {Created.class, Updated.class}) private String permissionId; - @Schema(title = "功能菜单", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 64]") + @Schema(title = "功能菜单", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_permission.module_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 64, message = "{user_role_permission.module_id.length_range}", groups = {Created.class, Updated.class}) private String moduleId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleRelation.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleRelation.java index b817f2d118..3ba6a2b86f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleRelation.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleRelation.java @@ -10,22 +10,22 @@ import lombok.Data; @Data public class UserRoleRelation implements Serializable { - @Schema(title = "用户组关系ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户组关系ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_relation.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{user_role_relation.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_relation.user_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_role_relation.user_id.length_range}", groups = {Created.class, Updated.class}) private String userId; - @Schema(title = "组ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "组ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_relation.role_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_role_relation.role_id.length_range}", groups = {Created.class, Updated.class}) private String roleId; - @Schema(title = "工作空间或项目ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "工作空间或项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{user_role_relation.source_id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{user_role_relation.source_id.length_range}", groups = {Created.class, Updated.class}) private String sourceId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Workspace.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Workspace.java index f239700041..8d8c380ccd 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Workspace.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Workspace.java @@ -10,12 +10,12 @@ import lombok.Data; @Data public class Workspace implements Serializable { - @Schema(title = "工作空间ID", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "工作空间ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{workspace.id.not_blank}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{workspace.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(title = "工作空间名称", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 100]") + @Schema(title = "工作空间名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{workspace.name.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 100, message = "{workspace.name.length_range}", groups = {Created.class, Updated.class}) private String name; @@ -29,7 +29,7 @@ public class Workspace implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = "range[1, 50]") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{workspace.create_user.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{workspace.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; diff --git a/backend/framework/domain/src/main/resources/generatorConfig.xml b/backend/framework/domain/src/main/resources/generatorConfig.xml index faaa86f506..964bbea9e3 100644 --- a/backend/framework/domain/src/main/resources/generatorConfig.xml +++ b/backend/framework/domain/src/main/resources/generatorConfig.xml @@ -53,34 +53,44 @@ - + - + - - -
-
-
-
-
-
-
-
-
-
-
- +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+