build: project domain

backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java

@@ -17,7 +17,7 @@ public class ApiTemplate implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{api_template.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")

backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java

@@ -12,12 +12,12 @@ import lombok.Data;
 public class CustomField implements Serializable {
     @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})
+    @Size(min = 1, max = 50, message = "{custom_field.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
     @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})
+    @Size(min = 1, max = 255, message = "{custom_field.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED)

backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class CustomFunctionBlob implements Serializable {
     @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{custom_function_blob.function_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{custom_function_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{custom_function_blob.function_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{custom_function_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String functionId;
+    private String id;
 
     @Schema(title = "参数列表")
     private byte[] params;

backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlobExample.java

@@ -104,73 +104,73 @@ public class CustomFunctionBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andFunctionIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("function_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("function_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("function_id =", value, "functionId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("function_id <>", value, "functionId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("function_id >", value, "functionId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("function_id >=", value, "functionId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("function_id <", value, "functionId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("function_id <=", value, "functionId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("function_id like", value, "functionId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("function_id not like", value, "functionId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("function_id in", values, "functionId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("function_id not in", values, "functionId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("function_id between", value1, value2, "functionId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("function_id not between", value1, value2, "functionId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class FakeErrorBlob implements Serializable {
     @Schema(title = "Test ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{fake_error_blob.fake_error_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{fake_error_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{fake_error_blob.fake_error_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{fake_error_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String fakeErrorId;
+    private String id;
 
     @Schema(title = "内容")
     private byte[] content;

backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java

@@ -104,73 +104,73 @@ public class FakeErrorBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andFakeErrorIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("fake_error_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("fake_error_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("fake_error_id =", value, "fakeErrorId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("fake_error_id <>", value, "fakeErrorId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("fake_error_id >", value, "fakeErrorId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("fake_error_id >=", value, "fakeErrorId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("fake_error_id <", value, "fakeErrorId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("fake_error_id <=", value, "fakeErrorId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("fake_error_id like", value, "fakeErrorId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("fake_error_id not like", value, "fakeErrorId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("fake_error_id in", values, "fakeErrorId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("fake_error_id not in", values, "fakeErrorId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("fake_error_id between", value1, value2, "fakeErrorId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFakeErrorIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("fake_error_id not between", value1, value2, "fakeErrorId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java

@@ -17,7 +17,7 @@ public class FileMetadata implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{file_metadata.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "文件类型")
@@ -34,7 +34,9 @@ public class FileMetadata implements Serializable {
     @Schema(title = "更新时间")
     private Long updateTime;
 
-    @Schema(title = "项目ID")
+    @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{file_metadata.project_id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{file_metadata.project_id.length_range}", groups = {Created.class, Updated.class})
     private String projectId;
 
     @Schema(title = "文件存储方式", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -42,10 +44,14 @@ public class FileMetadata implements Serializable {
     @Size(min = 1, max = 50, message = "{file_metadata.storage.length_range}", groups = {Created.class, Updated.class})
     private String storage;
 
-    @Schema(title = "创建人")
+    @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{file_metadata.create_user.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{file_metadata.create_user.length_range}", groups = {Created.class, Updated.class})
     private String createUser;
 
-    @Schema(title = "修改人")
+    @Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{file_metadata.update_user.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{file_metadata.update_user.length_range}", groups = {Created.class, Updated.class})
     private String updateUser;
 
     @Schema(title = "标签")
@@ -66,10 +72,14 @@ public class FileMetadata implements Serializable {
     @Schema(title = "资源作用范围，主要兼容2.1版本前的历史数据，后续版本不再产生数据")
     private String resourceType;
 
-    @Schema(title = "是否是最新版")
+    @Schema(title = "是否是最新版", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{file_metadata.latest.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 1, message = "{file_metadata.latest.length_range}", groups = {Created.class, Updated.class})
     private Boolean latest;
 
-    @Schema(title = "同版本数据关联的ID")
+    @Schema(title = "同版本数据关联的ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{file_metadata.ref_id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{file_metadata.ref_id.length_range}", groups = {Created.class, Updated.class})
     private String refId;
 
     private static final long serialVersionUID = 1L;

backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class FileMetadataBlob implements Serializable {
     @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{file_metadata_blob.file_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{file_metadata_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 255, message = "{file_metadata_blob.file_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{file_metadata_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String fileId;
+    private String id;
 
     @Schema(title = "储存库")
     private byte[] gitInfo;

backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlobExample.java

@@ -104,73 +104,73 @@ public class FileMetadataBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andFileIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("file_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("file_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("file_id =", value, "fileId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("file_id <>", value, "fileId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("file_id >", value, "fileId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("file_id >=", value, "fileId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("file_id <", value, "fileId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("file_id <=", value, "fileId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("file_id like", value, "fileId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("file_id not like", value, "fileId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("file_id in", values, "fileId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("file_id not in", values, "fileId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("file_id between", value1, value2, "fileId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("file_id not between", value1, value2, "fileId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class FileModuleBlob implements Serializable {
     @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{file_module_blob.file_module_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{file_module_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{file_module_blob.file_module_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{file_module_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String fileModuleId;
+    private String id;
 
     @Schema(title = "存储库路径")
     private String repositoryPath;

backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlobExample.java

@@ -104,73 +104,73 @@ public class FileModuleBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andFileModuleIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("file_module_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("file_module_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("file_module_id =", value, "fileModuleId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("file_module_id <>", value, "fileModuleId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("file_module_id >", value, "fileModuleId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("file_module_id >=", value, "fileModuleId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("file_module_id <", value, "fileModuleId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("file_module_id <=", value, "fileModuleId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("file_module_id like", value, "fileModuleId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("file_module_id not like", value, "fileModuleId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("file_module_id in", values, "fileModuleId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("file_module_id not in", values, "fileModuleId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("file_module_id between", value1, value2, "fileModuleId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andFileModuleIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("file_module_id not between", value1, value2, "fileModuleId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java

@@ -17,7 +17,7 @@ public class FunctionalCaseTemplate implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{functional_case_template.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")

backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class FunctionalCaseTemplateExtend implements Serializable {
     @Schema(title = "模板ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case_template_extend.template_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{functional_case_template_extend.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{functional_case_template_extend.template_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{functional_case_template_extend.id.length_range}", groups = {Created.class, Updated.class})
-    private String templateId;
+    private String id;
 
     @Schema(title = "用例名称模板")
     private String caseName;

backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtendExample.java

@@ -104,73 +104,73 @@ public class FunctionalCaseTemplateExtendExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andTemplateIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("template_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("template_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("template_id =", value, "templateId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("template_id <>", value, "templateId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("template_id >", value, "templateId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("template_id >=", value, "templateId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("template_id <", value, "templateId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("template_id <=", value, "templateId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("template_id like", value, "templateId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("template_id not like", value, "templateId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("template_id in", values, "templateId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("template_id not in", values, "templateId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("template_id between", value1, value2, "templateId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("template_id not between", value1, value2, "templateId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java

@@ -17,7 +17,7 @@ public class IssueTemplate implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")

backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class IssueTemplateExtend implements Serializable {
     @Schema(title = "缺陷模板ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_template_extend.template_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{issue_template_extend.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 100, message = "{issue_template_extend.template_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{issue_template_extend.id.length_range}", groups = {Created.class, Updated.class})
-    private String templateId;
+    private String id;
 
     @Schema(title = "缺陷标题模板")
     private String title;

backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtendExample.java

@@ -104,73 +104,73 @@ public class IssueTemplateExtendExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andTemplateIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("template_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("template_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("template_id =", value, "templateId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("template_id <>", value, "templateId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("template_id >", value, "templateId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("template_id >=", value, "templateId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("template_id <", value, "templateId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("template_id <=", value, "templateId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("template_id like", value, "templateId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("template_id not like", value, "templateId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("template_id in", values, "templateId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("template_id not in", values, "templateId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("template_id between", value1, value2, "templateId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("template_id not between", value1, value2, "templateId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java

@@ -22,7 +22,7 @@ public class Project implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{project.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "项目描述")

backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class ProjectExtend implements Serializable {
     @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{project_extend.project_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{project_extend.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{project_extend.project_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{project_extend.id.length_range}", groups = {Created.class, Updated.class})
-    private String projectId;
+    private String id;
 
     @Schema(title = "")
     private String tapdId;

backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtendExample.java

@@ -104,73 +104,73 @@ public class ProjectExtendExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andProjectIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("project_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("project_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("project_id =", value, "projectId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("project_id <>", value, "projectId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("project_id >", value, "projectId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("project_id >=", value, "projectId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("project_id <", value, "projectId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("project_id <=", value, "projectId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("project_id like", value, "projectId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("project_id not like", value, "projectId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("project_id in", values, "projectId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("project_id not in", values, "projectId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("project_id between", value1, value2, "projectId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("project_id not between", value1, value2, "projectId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java

@@ -22,7 +22,7 @@ public class ProjectVersion implements Serializable {
 
     @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})
+    @Size(min = 1, max = 255, message = "{project_version.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")
@@ -50,7 +50,7 @@ public class ProjectVersion implements Serializable {
 
     @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})
+    @Size(min = 1, max = 50, message = "{project_version.create_user.length_range}", groups = {Created.class, Updated.class})
     private String createUser;
 
     private static final long serialVersionUID = 1L;

backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.java

@@ -10,7 +10,7 @@ public interface CustomFunctionBlobMapper {
 
     int deleteByExample(CustomFunctionBlobExample example);
 
-    int deleteByPrimaryKey(String functionId);
+    int deleteByPrimaryKey(String id);
 
     int insert(CustomFunctionBlob record);
 
@@ -20,7 +20,7 @@ public interface CustomFunctionBlobMapper {
 
     List<CustomFunctionBlob> selectByExample(CustomFunctionBlobExample example);
 
-    CustomFunctionBlob selectByPrimaryKey(String functionId);
+    CustomFunctionBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") CustomFunctionBlob record, @Param("example") CustomFunctionBlobExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.CustomFunctionBlobMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.CustomFunctionBlob">
-    <id column="function_id" jdbcType="VARCHAR" property="functionId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.CustomFunctionBlob">
     <result column="params" jdbcType="LONGVARBINARY" property="params" />
@@ -68,7 +68,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    function_id
+    id
   </sql>
   <sql id="Blob_Column_List">
     params, script, `result`
@@ -109,11 +109,11 @@
     ,
     <include refid="Blob_Column_List" />
     from custom_function_blob
-    where function_id = #{functionId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from custom_function_blob
-    where function_id = #{functionId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.CustomFunctionBlobExample">
     delete from custom_function_blob
@@ -122,16 +122,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.CustomFunctionBlob">
-    insert into custom_function_blob (function_id, params, script, 
+    insert into custom_function_blob (id, params, script, 
       `result`)
-    values (#{functionId,jdbcType=VARCHAR}, #{params,jdbcType=LONGVARBINARY}, #{script,jdbcType=LONGVARBINARY}, 
+    values (#{id,jdbcType=VARCHAR}, #{params,jdbcType=LONGVARBINARY}, #{script,jdbcType=LONGVARBINARY}, 
       #{result,jdbcType=LONGVARBINARY})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.CustomFunctionBlob">
     insert into custom_function_blob
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="functionId != null">
+      <if test="id != null">
-        function_id,
+        id,
       </if>
       <if test="params != null">
         params,
@@ -144,8 +144,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="functionId != null">
+      <if test="id != null">
-        #{functionId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="params != null">
         #{params,jdbcType=LONGVARBINARY},
@@ -167,8 +167,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update custom_function_blob
     <set>
-      <if test="record.functionId != null">
+      <if test="record.id != null">
-        function_id = #{record.functionId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.params != null">
         params = #{record.params,jdbcType=LONGVARBINARY},
@@ -186,7 +186,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update custom_function_blob
-    set function_id = #{record.functionId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       params = #{record.params,jdbcType=LONGVARBINARY},
       script = #{record.script,jdbcType=LONGVARBINARY},
       `result` = #{record.result,jdbcType=LONGVARBINARY}
@@ -196,7 +196,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update custom_function_blob
-    set function_id = #{record.functionId,jdbcType=VARCHAR}
+    set id = #{record.id,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -214,13 +214,13 @@
         `result` = #{result,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where function_id = #{functionId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.CustomFunctionBlob">
     update custom_function_blob
     set params = #{params,jdbcType=LONGVARBINARY},
       script = #{script,jdbcType=LONGVARBINARY},
       `result` = #{result,jdbcType=LONGVARBINARY}
-    where function_id = #{functionId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java

@@ -10,7 +10,7 @@ public interface FakeErrorBlobMapper {
 
     int deleteByExample(FakeErrorBlobExample example);
 
-    int deleteByPrimaryKey(String fakeErrorId);
+    int deleteByPrimaryKey(String id);
 
     int insert(FakeErrorBlob record);
 
@@ -20,7 +20,7 @@ public interface FakeErrorBlobMapper {
 
     List<FakeErrorBlob> selectByExample(FakeErrorBlobExample example);
 
-    FakeErrorBlob selectByPrimaryKey(String fakeErrorId);
+    FakeErrorBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") FakeErrorBlob record, @Param("example") FakeErrorBlobExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.FakeErrorBlobMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.FakeErrorBlob">
-    <id column="fake_error_id" jdbcType="VARCHAR" property="fakeErrorId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.FakeErrorBlob">
     <result column="content" jdbcType="LONGVARBINARY" property="content" />
@@ -67,7 +67,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    fake_error_id
+    id
   </sql>
   <sql id="Blob_Column_List">
     content, description
@@ -108,11 +108,11 @@
     ,
     <include refid="Blob_Column_List" />
     from fake_error_blob
-    where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from fake_error_blob
-    where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.FakeErrorBlobExample">
     delete from fake_error_blob
@@ -121,16 +121,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.FakeErrorBlob">
-    insert into fake_error_blob (fake_error_id, content, description
+    insert into fake_error_blob (id, content, description
       )
-    values (#{fakeErrorId,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{description,jdbcType=LONGVARBINARY}
+    values (#{id,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{description,jdbcType=LONGVARBINARY}
       )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FakeErrorBlob">
     insert into fake_error_blob
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fakeErrorId != null">
+      <if test="id != null">
-        fake_error_id,
+        id,
       </if>
       <if test="content != null">
         content,
@@ -140,8 +140,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fakeErrorId != null">
+      <if test="id != null">
-        #{fakeErrorId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="content != null">
         #{content,jdbcType=LONGVARBINARY},
@@ -160,8 +160,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update fake_error_blob
     <set>
-      <if test="record.fakeErrorId != null">
+      <if test="record.id != null">
-        fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.content != null">
         content = #{record.content,jdbcType=LONGVARBINARY},
@@ -176,7 +176,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update fake_error_blob
-    set fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARBINARY},
       description = #{record.description,jdbcType=LONGVARBINARY}
     <if test="_parameter != null">
@@ -185,7 +185,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update fake_error_blob
-    set fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR}
+    set id = #{record.id,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -200,12 +200,12 @@
         description = #{description,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.FakeErrorBlob">
     update fake_error_blob
     set content = #{content,jdbcType=LONGVARBINARY},
       description = #{description,jdbcType=LONGVARBINARY}
-    where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.java

@@ -10,7 +10,7 @@ public interface FileMetadataBlobMapper {
 
     int deleteByExample(FileMetadataBlobExample example);
 
-    int deleteByPrimaryKey(String fileId);
+    int deleteByPrimaryKey(String id);
 
     int insert(FileMetadataBlob record);
 
@@ -20,7 +20,7 @@ public interface FileMetadataBlobMapper {
 
     List<FileMetadataBlob> selectByExample(FileMetadataBlobExample example);
 
-    FileMetadataBlob selectByPrimaryKey(String fileId);
+    FileMetadataBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") FileMetadataBlob record, @Param("example") FileMetadataBlobExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.FileMetadataBlobMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.FileMetadataBlob">
-    <id column="file_id" jdbcType="VARCHAR" property="fileId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.FileMetadataBlob">
     <result column="git_info" jdbcType="LONGVARBINARY" property="gitInfo" />
@@ -66,7 +66,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    file_id
+    id
   </sql>
   <sql id="Blob_Column_List">
     git_info
@@ -107,11 +107,11 @@
     ,
     <include refid="Blob_Column_List" />
     from file_metadata_blob
-    where file_id = #{fileId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from file_metadata_blob
-    where file_id = #{fileId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.FileMetadataBlobExample">
     delete from file_metadata_blob
@@ -120,22 +120,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.FileMetadataBlob">
-    insert into file_metadata_blob (file_id, git_info)
+    insert into file_metadata_blob (id, git_info)
-    values (#{fileId,jdbcType=VARCHAR}, #{gitInfo,jdbcType=LONGVARBINARY})
+    values (#{id,jdbcType=VARCHAR}, #{gitInfo,jdbcType=LONGVARBINARY})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FileMetadataBlob">
     insert into file_metadata_blob
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fileId != null">
+      <if test="id != null">
-        file_id,
+        id,
       </if>
       <if test="gitInfo != null">
         git_info,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fileId != null">
+      <if test="id != null">
-        #{fileId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="gitInfo != null">
         #{gitInfo,jdbcType=LONGVARBINARY},
@@ -151,8 +151,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update file_metadata_blob
     <set>
-      <if test="record.fileId != null">
+      <if test="record.id != null">
-        file_id = #{record.fileId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.gitInfo != null">
         git_info = #{record.gitInfo,jdbcType=LONGVARBINARY},
@@ -164,7 +164,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update file_metadata_blob
-    set file_id = #{record.fileId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       git_info = #{record.gitInfo,jdbcType=LONGVARBINARY}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -172,7 +172,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update file_metadata_blob
-    set file_id = #{record.fileId,jdbcType=VARCHAR}
+    set id = #{record.id,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -184,11 +184,11 @@
         git_info = #{gitInfo,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where file_id = #{fileId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.FileMetadataBlob">
     update file_metadata_blob
     set git_info = #{gitInfo,jdbcType=LONGVARBINARY}
-    where file_id = #{fileId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.java

@@ -10,7 +10,7 @@ public interface FileModuleBlobMapper {
 
     int deleteByExample(FileModuleBlobExample example);
 
-    int deleteByPrimaryKey(String fileModuleId);
+    int deleteByPrimaryKey(String id);
 
     int insert(FileModuleBlob record);
 
@@ -20,7 +20,7 @@ public interface FileModuleBlobMapper {
 
     List<FileModuleBlob> selectByExample(FileModuleBlobExample example);
 
-    FileModuleBlob selectByPrimaryKey(String fileModuleId);
+    FileModuleBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") FileModuleBlob record, @Param("example") FileModuleBlobExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.FileModuleBlobMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.FileModuleBlob">
-    <id column="file_module_id" jdbcType="VARCHAR" property="fileModuleId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="repository_path" jdbcType="VARCHAR" property="repositoryPath" />
     <result column="repository_user_name" jdbcType="VARCHAR" property="repositoryUserName" />
     <result column="repository_token" jdbcType="VARCHAR" property="repositoryToken" />
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    file_module_id, repository_path, repository_user_name, repository_token
+    id, repository_path, repository_user_name, repository_token
   </sql>
   <sql id="Blob_Column_List">
     repository_desc
@@ -110,11 +110,11 @@
     ,
     <include refid="Blob_Column_List" />
     from file_module_blob
-    where file_module_id = #{fileModuleId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from file_module_blob
-    where file_module_id = #{fileModuleId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.FileModuleBlobExample">
     delete from file_module_blob
@@ -123,16 +123,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.FileModuleBlob">
-    insert into file_module_blob (file_module_id, repository_path, repository_user_name, 
+    insert into file_module_blob (id, repository_path, repository_user_name, 
       repository_token, repository_desc)
-    values (#{fileModuleId,jdbcType=VARCHAR}, #{repositoryPath,jdbcType=VARCHAR}, #{repositoryUserName,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{repositoryPath,jdbcType=VARCHAR}, #{repositoryUserName,jdbcType=VARCHAR}, 
       #{repositoryToken,jdbcType=VARCHAR}, #{repositoryDesc,jdbcType=LONGVARBINARY})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FileModuleBlob">
     insert into file_module_blob
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fileModuleId != null">
+      <if test="id != null">
-        file_module_id,
+        id,
       </if>
       <if test="repositoryPath != null">
         repository_path,
@@ -148,8 +148,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fileModuleId != null">
+      <if test="id != null">
-        #{fileModuleId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="repositoryPath != null">
         #{repositoryPath,jdbcType=VARCHAR},
@@ -174,8 +174,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update file_module_blob
     <set>
-      <if test="record.fileModuleId != null">
+      <if test="record.id != null">
-        file_module_id = #{record.fileModuleId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.repositoryPath != null">
         repository_path = #{record.repositoryPath,jdbcType=VARCHAR},
@@ -196,7 +196,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update file_module_blob
-    set file_module_id = #{record.fileModuleId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       repository_path = #{record.repositoryPath,jdbcType=VARCHAR},
       repository_user_name = #{record.repositoryUserName,jdbcType=VARCHAR},
       repository_token = #{record.repositoryToken,jdbcType=VARCHAR},
@@ -207,7 +207,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update file_module_blob
-    set file_module_id = #{record.fileModuleId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       repository_path = #{record.repositoryPath,jdbcType=VARCHAR},
       repository_user_name = #{record.repositoryUserName,jdbcType=VARCHAR},
       repository_token = #{record.repositoryToken,jdbcType=VARCHAR}
@@ -231,7 +231,7 @@
         repository_desc = #{repositoryDesc,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where file_module_id = #{fileModuleId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.FileModuleBlob">
     update file_module_blob
@@ -239,13 +239,13 @@
       repository_user_name = #{repositoryUserName,jdbcType=VARCHAR},
       repository_token = #{repositoryToken,jdbcType=VARCHAR},
       repository_desc = #{repositoryDesc,jdbcType=LONGVARBINARY}
-    where file_module_id = #{fileModuleId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.FileModuleBlob">
     update file_module_blob
     set repository_path = #{repositoryPath,jdbcType=VARCHAR},
       repository_user_name = #{repositoryUserName,jdbcType=VARCHAR},
       repository_token = #{repositoryToken,jdbcType=VARCHAR}
-    where file_module_id = #{fileModuleId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.java

@@ -10,7 +10,7 @@ public interface FunctionalCaseTemplateExtendMapper {
 
     int deleteByExample(FunctionalCaseTemplateExtendExample example);
 
-    int deleteByPrimaryKey(String templateId);
+    int deleteByPrimaryKey(String id);
 
     int insert(FunctionalCaseTemplateExtend record);
 
@@ -20,7 +20,7 @@ public interface FunctionalCaseTemplateExtendMapper {
 
     List<FunctionalCaseTemplateExtend> selectByExample(FunctionalCaseTemplateExtendExample example);
 
-    FunctionalCaseTemplateExtend selectByPrimaryKey(String templateId);
+    FunctionalCaseTemplateExtend selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") FunctionalCaseTemplateExtend record, @Param("example") FunctionalCaseTemplateExtendExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.FunctionalCaseTemplateExtendMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.FunctionalCaseTemplateExtend">
-    <id column="template_id" jdbcType="VARCHAR" property="templateId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="case_name" jdbcType="VARCHAR" property="caseName" />
     <result column="step_model" jdbcType="VARCHAR" property="stepModel" />
   </resultMap>
@@ -72,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    template_id, case_name, step_model
+    id, case_name, step_model
   </sql>
   <sql id="Blob_Column_List">
     prerequisite, step_description, expected_result, actual_result, steps
@@ -113,11 +113,11 @@
     ,
     <include refid="Blob_Column_List" />
     from functional_case_template_extend
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from functional_case_template_extend
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExtendExample">
     delete from functional_case_template_extend
@@ -126,11 +126,11 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExtend">
-    insert into functional_case_template_extend (template_id, case_name, step_model, 
+    insert into functional_case_template_extend (id, case_name, step_model, 
       prerequisite, step_description, 
       expected_result, actual_result, steps
       )
-    values (#{templateId,jdbcType=VARCHAR}, #{caseName,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{caseName,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, 
       #{prerequisite,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR}, 
       #{expectedResult,jdbcType=LONGVARCHAR}, #{actualResult,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}
       )
@@ -138,8 +138,8 @@
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExtend">
     insert into functional_case_template_extend
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
+      <if test="id != null">
-        template_id,
+        id,
       </if>
       <if test="caseName != null">
         case_name,
@@ -164,8 +164,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
+      <if test="id != null">
-        #{templateId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="caseName != null">
         #{caseName,jdbcType=VARCHAR},
@@ -199,8 +199,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update functional_case_template_extend
     <set>
-      <if test="record.templateId != null">
+      <if test="record.id != null">
-        template_id = #{record.templateId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.caseName != null">
         case_name = #{record.caseName,jdbcType=VARCHAR},
@@ -230,7 +230,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update functional_case_template_extend
-    set template_id = #{record.templateId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       case_name = #{record.caseName,jdbcType=VARCHAR},
       step_model = #{record.stepModel,jdbcType=VARCHAR},
       prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR},
@@ -244,7 +244,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update functional_case_template_extend
-    set template_id = #{record.templateId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       case_name = #{record.caseName,jdbcType=VARCHAR},
       step_model = #{record.stepModel,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -276,7 +276,7 @@
         steps = #{steps,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExtend">
     update functional_case_template_extend
@@ -287,12 +287,12 @@
       expected_result = #{expectedResult,jdbcType=LONGVARCHAR},
       actual_result = #{actualResult,jdbcType=LONGVARCHAR},
       steps = #{steps,jdbcType=LONGVARCHAR}
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExtend">
     update functional_case_template_extend
     set case_name = #{caseName,jdbcType=VARCHAR},
       step_model = #{stepModel,jdbcType=VARCHAR}
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.java

@@ -10,7 +10,7 @@ public interface IssueTemplateExtendMapper {
 
     int deleteByExample(IssueTemplateExtendExample example);
 
-    int deleteByPrimaryKey(String templateId);
+    int deleteByPrimaryKey(String id);
 
     int insert(IssueTemplateExtend record);
 
@@ -20,7 +20,7 @@ public interface IssueTemplateExtendMapper {
 
     List<IssueTemplateExtend> selectByExample(IssueTemplateExtendExample example);
 
-    IssueTemplateExtend selectByPrimaryKey(String templateId);
+    IssueTemplateExtend selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") IssueTemplateExtend record, @Param("example") IssueTemplateExtendExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.IssueTemplateExtendMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.IssueTemplateExtend">
-    <id column="template_id" jdbcType="VARCHAR" property="templateId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="title" jdbcType="VARCHAR" property="title" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.IssueTemplateExtend">
@@ -67,7 +67,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    template_id, title
+    id, title
   </sql>
   <sql id="Blob_Column_List">
     content
@@ -108,11 +108,11 @@
     ,
     <include refid="Blob_Column_List" />
     from issue_template_extend
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from issue_template_extend
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.IssueTemplateExtendExample">
     delete from issue_template_extend
@@ -121,16 +121,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    insert into issue_template_extend (template_id, title, content
+    insert into issue_template_extend (id, title, content
       )
-    values (#{templateId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}
+    values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
     insert into issue_template_extend
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
+      <if test="id != null">
-        template_id,
+        id,
       </if>
       <if test="title != null">
         title,
@@ -140,8 +140,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="templateId != null">
+      <if test="id != null">
-        #{templateId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
@@ -160,8 +160,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update issue_template_extend
     <set>
-      <if test="record.templateId != null">
+      <if test="record.id != null">
-        template_id = #{record.templateId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
@@ -176,7 +176,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update issue_template_extend
-    set template_id = #{record.templateId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -185,7 +185,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update issue_template_extend
-    set template_id = #{record.templateId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,17 +201,17 @@
         content = #{content,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
     update issue_template_extend
     set title = #{title,jdbcType=VARCHAR},
       content = #{content,jdbcType=LONGVARCHAR}
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
     update issue_template_extend
     set title = #{title,jdbcType=VARCHAR}
-    where template_id = #{templateId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.java

@@ -10,7 +10,7 @@ public interface ProjectExtendMapper {
 
     int deleteByExample(ProjectExtendExample example);
 
-    int deleteByPrimaryKey(String projectId);
+    int deleteByPrimaryKey(String id);
 
     int insert(ProjectExtend record);
 
@@ -20,7 +20,7 @@ public interface ProjectExtendMapper {
 
     List<ProjectExtend> selectByExample(ProjectExtendExample example);
 
-    ProjectExtend selectByPrimaryKey(String projectId);
+    ProjectExtend selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") ProjectExtend record, @Param("example") ProjectExtendExample example);
 

backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.project.mapper.ProjectExtendMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.ProjectExtend">
-    <id column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="tapd_id" jdbcType="VARCHAR" property="tapdId" />
     <result column="jira_key" jdbcType="VARCHAR" property="jiraKey" />
     <result column="zentao_id" jdbcType="VARCHAR" property="zentaoId" />
@@ -76,7 +76,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    project_id, tapd_id, jira_key, zentao_id, azure_devops_id, case_template_id, azure_filter_id, 
+    id, tapd_id, jira_key, zentao_id, azure_devops_id, case_template_id, azure_filter_id, 
     platform, third_part_template, version_enable, api_template_id
   </sql>
   <sql id="Blob_Column_List">
@@ -118,11 +118,11 @@
     ,
     <include refid="Blob_Column_List" />
     from project_extend
-    where project_id = #{projectId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from project_extend
-    where project_id = #{projectId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="io.metersphere.project.domain.ProjectExtendExample">
     delete from project_extend
@@ -131,12 +131,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.ProjectExtend">
-    insert into project_extend (project_id, tapd_id, jira_key, 
+    insert into project_extend (id, tapd_id, jira_key, 
       zentao_id, azure_devops_id, case_template_id, 
       azure_filter_id, platform, third_part_template, 
       version_enable, api_template_id, issue_config
       )
-    values (#{projectId,jdbcType=VARCHAR}, #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, 
       #{zentaoId,jdbcType=VARCHAR}, #{azureDevopsId,jdbcType=VARCHAR}, #{caseTemplateId,jdbcType=VARCHAR}, 
       #{azureFilterId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{thirdPartTemplate,jdbcType=BIT}, 
       #{versionEnable,jdbcType=BIT}, #{apiTemplateId,jdbcType=VARCHAR}, #{issueConfig,jdbcType=LONGVARBINARY}
@@ -145,8 +145,8 @@
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.ProjectExtend">
     insert into project_extend
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="projectId != null">
+      <if test="id != null">
-        project_id,
+        id,
       </if>
       <if test="tapdId != null">
         tapd_id,
@@ -183,8 +183,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="projectId != null">
+      <if test="id != null">
-        #{projectId,jdbcType=VARCHAR},
+        #{id,jdbcType=VARCHAR},
       </if>
       <if test="tapdId != null">
         #{tapdId,jdbcType=VARCHAR},
@@ -230,8 +230,8 @@
   <update id="updateByExampleSelective" parameterType="map">
     update project_extend
     <set>
-      <if test="record.projectId != null">
+      <if test="record.id != null">
-        project_id = #{record.projectId,jdbcType=VARCHAR},
+        id = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.tapdId != null">
         tapd_id = #{record.tapdId,jdbcType=VARCHAR},
@@ -273,7 +273,7 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update project_extend
-    set project_id = #{record.projectId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       tapd_id = #{record.tapdId,jdbcType=VARCHAR},
       jira_key = #{record.jiraKey,jdbcType=VARCHAR},
       zentao_id = #{record.zentaoId,jdbcType=VARCHAR},
@@ -291,7 +291,7 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update project_extend
-    set project_id = #{record.projectId,jdbcType=VARCHAR},
+    set id = #{record.id,jdbcType=VARCHAR},
       tapd_id = #{record.tapdId,jdbcType=VARCHAR},
       jira_key = #{record.jiraKey,jdbcType=VARCHAR},
       zentao_id = #{record.zentaoId,jdbcType=VARCHAR},
@@ -343,7 +343,7 @@
         issue_config = #{issueConfig,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where project_id = #{projectId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.ProjectExtend">
     update project_extend
@@ -358,7 +358,7 @@
       version_enable = #{versionEnable,jdbcType=BIT},
       api_template_id = #{apiTemplateId,jdbcType=VARCHAR},
       issue_config = #{issueConfig,jdbcType=LONGVARBINARY}
-    where project_id = #{projectId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.ProjectExtend">
     update project_extend
@@ -372,6 +372,6 @@
       third_part_template = #{thirdPartTemplate,jdbcType=BIT},
       version_enable = #{versionEnable,jdbcType=BIT},
       api_template_id = #{apiTemplateId,jdbcType=VARCHAR}
-    where project_id = #{projectId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/resources/generatorConfig.xml

@@ -53,44 +53,40 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
         <!-- 模型对象 -->
-        <javaModelGenerator targetPackage="io.metersphere.system.domain" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="io.metersphere.project.domain" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
             <property name="trimStrings" value="true"/>
         </javaModelGenerator>
         <!-- XML映射文件 -->
-        <sqlMapGenerator targetPackage="io.metersphere.system.mapper" targetProject="src/main/java">
+        <sqlMapGenerator targetPackage="io.metersphere.project.mapper" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
         <!-- 接口 -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="io.metersphere.system.mapper"
+        <javaClientGenerator type="XMLMAPPER" targetPackage="io.metersphere.project.mapper"
                              targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
         <!--要生成的数据库表 -->
-        <table tableName="auth_source"/>
+        <table tableName="custom_field"/>
-        <table tableName="license"/>
+        <table tableName="custom_field_template"/>
-        <table tableName="message_task"/>
+        <table tableName="custom_function"/>
-        <table tableName="message_task_blob"/>
+        <table tableName="fake_error"/>
-        <table tableName="notification"/>
+        <table tableName="file_metadata"/>
-        <table tableName="novice_statistics"/>
+        <table tableName="file_module"/>
-        <table tableName="operating_log"/>
+        <table tableName="project"/>
-        <table tableName="operating_log_resource"/>
+        <table tableName="project_application"/>
-        <table tableName="plugin"/>
+        <table tableName="project_version"/>
-        <table tableName="plugin_blob"/>
+        <table tableName="file_module_blob"/>
-        <table tableName="quota"/>
+        <table tableName="custom_function_blob"/>
-        <table tableName="schedule"/>
+        <table tableName="fake_error_blob"/>
-        <table tableName="service_integration"/>
+        <table tableName="file_metadata_blob"/>
-        <table tableName="system_parameter"/>
+        <table tableName="project_extend"/>
-        <table tableName="test_resource"/>
+        <table tableName="functional_case_template"/>
-        <table tableName="test_resource_pool"/>
+        <table tableName="functional_case_template_extend"/>
-        <table tableName="user"/>
+        <table tableName="issue_template_extend"/>
-        <table tableName="user_extend"/>
+        <table tableName="issue_template"/>
-        <table tableName="user_key"/>
+        <table tableName="api_template"/>
-        <table tableName="user_role"/>
-        <table tableName="user_role_permission"/>
-        <table tableName="user_role_relation"/>
-        <table tableName="workspace"/>
 
         <!--        要忽略的字段-->
         <!-- <table tableName="test_case">