ci: 部分表字段调整

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

@@ -21,9 +21,9 @@ public class ApiTemplate implements Serializable {
     @Schema(title = "描述")
     private String description;
 
-    @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{api_template.system.not_blank}", groups = {Created.class})
-    private Boolean system;
+    @Schema(title = "是否是内置模板", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{api_template.internal.not_blank}", groups = {Created.class})
+    private Boolean internal;
 
     @Schema(title = "创建时间")
     private Long createTime;

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

@@ -314,63 +314,63 @@ public class ApiTemplateExample {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNull() {
-            addCriterion("`system` is null");
+        public Criteria andInternalIsNull() {
+            addCriterion("internal is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNotNull() {
-            addCriterion("`system` is not null");
+        public Criteria andInternalIsNotNull() {
+            addCriterion("internal is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemEqualTo(Boolean value) {
-            addCriterion("`system` =", value, "system");
+        public Criteria andInternalEqualTo(Boolean value) {
+            addCriterion("internal =", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotEqualTo(Boolean value) {
-            addCriterion("`system` <>", value, "system");
+        public Criteria andInternalNotEqualTo(Boolean value) {
+            addCriterion("internal <>", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThan(Boolean value) {
-            addCriterion("`system` >", value, "system");
+        public Criteria andInternalGreaterThan(Boolean value) {
+            addCriterion("internal >", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("`system` >=", value, "system");
+        public Criteria andInternalGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("internal >=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThan(Boolean value) {
-            addCriterion("`system` <", value, "system");
+        public Criteria andInternalLessThan(Boolean value) {
+            addCriterion("internal <", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThanOrEqualTo(Boolean value) {
-            addCriterion("`system` <=", value, "system");
+        public Criteria andInternalLessThanOrEqualTo(Boolean value) {
+            addCriterion("internal <=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIn(List<Boolean> values) {
-            addCriterion("`system` in", values, "system");
+        public Criteria andInternalIn(List<Boolean> values) {
+            addCriterion("internal in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotIn(List<Boolean> values) {
-            addCriterion("`system` not in", values, "system");
+        public Criteria andInternalNotIn(List<Boolean> values) {
+            addCriterion("internal not in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` between", value1, value2, "system");
+        public Criteria andInternalBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal between", value1, value2, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` not between", value1, value2, "system");
+        public Criteria andInternalNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal not between", value1, value2, "internal");
             return (Criteria) this;
         }
 

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

@@ -21,9 +21,9 @@ public class BugTemplate implements Serializable {
     @Schema(title = "描述")
     private String description;
 
-    @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{bug_template.system.not_blank}", groups = {Created.class})
-    private Boolean system;
+    @Schema(title = "是否是内置模板", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{bug_template.internal.not_blank}", groups = {Created.class})
+    private Boolean internal;
 
     @Schema(title = "创建时间")
     private Long createTime;

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

@@ -314,63 +314,63 @@ public class BugTemplateExample {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNull() {
-            addCriterion("`system` is null");
+        public Criteria andInternalIsNull() {
+            addCriterion("internal is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNotNull() {
-            addCriterion("`system` is not null");
+        public Criteria andInternalIsNotNull() {
+            addCriterion("internal is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemEqualTo(Boolean value) {
-            addCriterion("`system` =", value, "system");
+        public Criteria andInternalEqualTo(Boolean value) {
+            addCriterion("internal =", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotEqualTo(Boolean value) {
-            addCriterion("`system` <>", value, "system");
+        public Criteria andInternalNotEqualTo(Boolean value) {
+            addCriterion("internal <>", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThan(Boolean value) {
-            addCriterion("`system` >", value, "system");
+        public Criteria andInternalGreaterThan(Boolean value) {
+            addCriterion("internal >", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("`system` >=", value, "system");
+        public Criteria andInternalGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("internal >=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThan(Boolean value) {
-            addCriterion("`system` <", value, "system");
+        public Criteria andInternalLessThan(Boolean value) {
+            addCriterion("internal <", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThanOrEqualTo(Boolean value) {
-            addCriterion("`system` <=", value, "system");
+        public Criteria andInternalLessThanOrEqualTo(Boolean value) {
+            addCriterion("internal <=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIn(List<Boolean> values) {
-            addCriterion("`system` in", values, "system");
+        public Criteria andInternalIn(List<Boolean> values) {
+            addCriterion("internal in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotIn(List<Boolean> values) {
-            addCriterion("`system` not in", values, "system");
+        public Criteria andInternalNotIn(List<Boolean> values) {
+            addCriterion("internal not in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` between", value1, value2, "system");
+        public Criteria andInternalBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal between", value1, value2, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` not between", value1, value2, "system");
+        public Criteria andInternalNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal not between", value1, value2, "internal");
             return (Criteria) this;
         }
 

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

@@ -21,9 +21,9 @@ public class FunctionalCaseTemplate implements Serializable {
     @Schema(title = "描述")
     private String description;
 
-    @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{functional_case_template.system.not_blank}", groups = {Created.class})
-    private Boolean system;
+    @Schema(title = "是否是内置模板", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{functional_case_template.internal.not_blank}", groups = {Created.class})
+    private Boolean internal;
 
     @Schema(title = "创建时间")
     private Long createTime;

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

@@ -314,63 +314,63 @@ public class FunctionalCaseTemplateExample {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNull() {
-            addCriterion("`system` is null");
+        public Criteria andInternalIsNull() {
+            addCriterion("internal is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNotNull() {
-            addCriterion("`system` is not null");
+        public Criteria andInternalIsNotNull() {
+            addCriterion("internal is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemEqualTo(Boolean value) {
-            addCriterion("`system` =", value, "system");
+        public Criteria andInternalEqualTo(Boolean value) {
+            addCriterion("internal =", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotEqualTo(Boolean value) {
-            addCriterion("`system` <>", value, "system");
+        public Criteria andInternalNotEqualTo(Boolean value) {
+            addCriterion("internal <>", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThan(Boolean value) {
-            addCriterion("`system` >", value, "system");
+        public Criteria andInternalGreaterThan(Boolean value) {
+            addCriterion("internal >", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("`system` >=", value, "system");
+        public Criteria andInternalGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("internal >=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThan(Boolean value) {
-            addCriterion("`system` <", value, "system");
+        public Criteria andInternalLessThan(Boolean value) {
+            addCriterion("internal <", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThanOrEqualTo(Boolean value) {
-            addCriterion("`system` <=", value, "system");
+        public Criteria andInternalLessThanOrEqualTo(Boolean value) {
+            addCriterion("internal <=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIn(List<Boolean> values) {
-            addCriterion("`system` in", values, "system");
+        public Criteria andInternalIn(List<Boolean> values) {
+            addCriterion("internal in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotIn(List<Boolean> values) {
-            addCriterion("`system` not in", values, "system");
+        public Criteria andInternalNotIn(List<Boolean> values) {
+            addCriterion("internal not in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` between", value1, value2, "system");
+        public Criteria andInternalBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal between", value1, value2, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` not between", value1, value2, "system");
+        public Criteria andInternalNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal not between", value1, value2, "internal");
             return (Criteria) this;
         }
 

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

@@ -13,6 +13,10 @@ public class Project implements Serializable {
     @Size(min = 1, max = 50, message = "{project.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
+    @Schema(title = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{project.num.not_blank}", groups = {Created.class})
+    private Long num;
+
     @Schema(title = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{project.organization_id.not_blank}", groups = {Created.class})
     @Size(min = 1, max = 50, message = "{project.organization_id.length_range}", groups = {Created.class, Updated.class})
@@ -35,8 +39,18 @@ public class Project implements Serializable {
     @Schema(title = "创建人")
     private String createUser;
 
-    @Schema(title = "")
-    private String systemId;
+    @Schema(title = "删除时间")
+    private Long deleteTime;
+
+    @Schema(title = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{project.deleted.not_blank}", groups = {Created.class})
+    private Boolean deleted;
+
+    @Schema(title = "删除人")
+    private String deleteUser;
+
+    @Schema(title = "是否启用")
+    private Boolean enable;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -174,6 +174,66 @@ public class ProjectExample {
             return (Criteria) this;
         }
 
+        public Criteria andNumIsNull() {
+            addCriterion("num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIsNotNull() {
+            addCriterion("num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumEqualTo(Long value) {
+            addCriterion("num =", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotEqualTo(Long value) {
+            addCriterion("num <>", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThan(Long value) {
+            addCriterion("num >", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThanOrEqualTo(Long value) {
+            addCriterion("num >=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThan(Long value) {
+            addCriterion("num <", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThanOrEqualTo(Long value) {
+            addCriterion("num <=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIn(List<Long> values) {
+            addCriterion("num in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotIn(List<Long> values) {
+            addCriterion("num not in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumBetween(Long value1, Long value2) {
+            addCriterion("num between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotBetween(Long value1, Long value2) {
+            addCriterion("num not between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
         public Criteria andOrganizationIdIsNull() {
             addCriterion("organization_id is null");
             return (Criteria) this;
@@ -574,73 +634,253 @@ public class ProjectExample {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIsNull() {
-            addCriterion("system_id is null");
+        public Criteria andDeleteTimeIsNull() {
+            addCriterion("delete_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIsNotNull() {
-            addCriterion("system_id is not null");
+        public Criteria andDeleteTimeIsNotNull() {
+            addCriterion("delete_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdEqualTo(String value) {
-            addCriterion("system_id =", value, "systemId");
+        public Criteria andDeleteTimeEqualTo(Long value) {
+            addCriterion("delete_time =", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdNotEqualTo(String value) {
-            addCriterion("system_id <>", value, "systemId");
+        public Criteria andDeleteTimeNotEqualTo(Long value) {
+            addCriterion("delete_time <>", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdGreaterThan(String value) {
-            addCriterion("system_id >", value, "systemId");
+        public Criteria andDeleteTimeGreaterThan(Long value) {
+            addCriterion("delete_time >", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdGreaterThanOrEqualTo(String value) {
-            addCriterion("system_id >=", value, "systemId");
+        public Criteria andDeleteTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("delete_time >=", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdLessThan(String value) {
-            addCriterion("system_id <", value, "systemId");
+        public Criteria andDeleteTimeLessThan(Long value) {
+            addCriterion("delete_time <", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdLessThanOrEqualTo(String value) {
-            addCriterion("system_id <=", value, "systemId");
+        public Criteria andDeleteTimeLessThanOrEqualTo(Long value) {
+            addCriterion("delete_time <=", value, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdLike(String value) {
-            addCriterion("system_id like", value, "systemId");
+        public Criteria andDeleteTimeIn(List<Long> values) {
+            addCriterion("delete_time in", values, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdNotLike(String value) {
-            addCriterion("system_id not like", value, "systemId");
+        public Criteria andDeleteTimeNotIn(List<Long> values) {
+            addCriterion("delete_time not in", values, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIn(List<String> values) {
-            addCriterion("system_id in", values, "systemId");
+        public Criteria andDeleteTimeBetween(Long value1, Long value2) {
+            addCriterion("delete_time between", value1, value2, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdNotIn(List<String> values) {
-            addCriterion("system_id not in", values, "systemId");
+        public Criteria andDeleteTimeNotBetween(Long value1, Long value2) {
+            addCriterion("delete_time not between", value1, value2, "deleteTime");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdBetween(String value1, String value2) {
-            addCriterion("system_id between", value1, value2, "systemId");
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdNotBetween(String value1, String value2) {
-            addCriterion("system_id not between", value1, value2, "systemId");
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIsNull() {
+            addCriterion("delete_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIsNotNull() {
+            addCriterion("delete_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserEqualTo(String value) {
+            addCriterion("delete_user =", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotEqualTo(String value) {
+            addCriterion("delete_user <>", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserGreaterThan(String value) {
+            addCriterion("delete_user >", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_user >=", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLessThan(String value) {
+            addCriterion("delete_user <", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLessThanOrEqualTo(String value) {
+            addCriterion("delete_user <=", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLike(String value) {
+            addCriterion("delete_user like", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotLike(String value) {
+            addCriterion("delete_user not like", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIn(List<String> values) {
+            addCriterion("delete_user in", values, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotIn(List<String> values) {
+            addCriterion("delete_user not in", values, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserBetween(String value1, String value2) {
+            addCriterion("delete_user between", value1, value2, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotBetween(String value1, String value2) {
+            addCriterion("delete_user not between", value1, value2, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIsNull() {
+            addCriterion("`enable` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIsNotNull() {
+            addCriterion("`enable` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableEqualTo(Boolean value) {
+            addCriterion("`enable` =", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotEqualTo(Boolean value) {
+            addCriterion("`enable` <>", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableGreaterThan(Boolean value) {
+            addCriterion("`enable` >", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` >=", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableLessThan(Boolean value) {
+            addCriterion("`enable` <", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableLessThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` <=", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIn(List<Boolean> values) {
+            addCriterion("`enable` in", values, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotIn(List<Boolean> values) {
+            addCriterion("`enable` not in", values, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` between", value1, value2, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
     }

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

@@ -43,10 +43,10 @@ public class ProjectExtend implements Serializable {
     private Boolean versionEnable;
 
     @Schema(title = "")
-    private String apiTemplateId;
+    private String issueConfig;
 
     @Schema(title = "")
-    private byte[] issueConfig;
+    private String apiTemplateId;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -784,6 +784,76 @@ public class ProjectExtendExample {
             return (Criteria) this;
         }
 
+        public Criteria andIssueConfigIsNull() {
+            addCriterion("issue_config is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigIsNotNull() {
+            addCriterion("issue_config is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigEqualTo(String value) {
+            addCriterion("issue_config =", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigNotEqualTo(String value) {
+            addCriterion("issue_config <>", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigGreaterThan(String value) {
+            addCriterion("issue_config >", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigGreaterThanOrEqualTo(String value) {
+            addCriterion("issue_config >=", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigLessThan(String value) {
+            addCriterion("issue_config <", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigLessThanOrEqualTo(String value) {
+            addCriterion("issue_config <=", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigLike(String value) {
+            addCriterion("issue_config like", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigNotLike(String value) {
+            addCriterion("issue_config not like", value, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigIn(List<String> values) {
+            addCriterion("issue_config in", values, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigNotIn(List<String> values) {
+            addCriterion("issue_config not in", values, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigBetween(String value1, String value2) {
+            addCriterion("issue_config between", value1, value2, "issueConfig");
+            return (Criteria) this;
+        }
+
+        public Criteria andIssueConfigNotBetween(String value1, String value2) {
+            addCriterion("issue_config not between", value1, value2, "issueConfig");
+            return (Criteria) this;
+        }
+
         public Criteria andApiTemplateIdIsNull() {
             addCriterion("api_template_id is null");
             return (Criteria) this;

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="system" jdbcType="BIT" property="system" />
+    <result column="internal" jdbcType="BIT" property="internal" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, description, `system`, create_time, create_user, project_id
+    id, `name`, description, internal, create_time, create_user, project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.ApiTemplateExample" resultMap="BaseResultMap">
     select
@@ -103,10 +103,10 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.ApiTemplate">
     insert into api_template (id, `name`, description, 
-      `system`, create_time, create_user, 
+      internal, create_time, create_user, 
       project_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{system,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
+      #{internal,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
       #{projectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.ApiTemplate">
@@ -121,8 +121,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="system != null">
-        `system`,
+      <if test="internal != null">
+        internal,
       </if>
       <if test="createTime != null">
         create_time,
@@ -144,8 +144,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        #{system,jdbcType=BIT},
+      <if test="internal != null">
+        #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -176,8 +176,8 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.system != null">
-        `system` = #{record.system,jdbcType=BIT},
+      <if test="record.internal != null">
+        internal = #{record.internal,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -198,7 +198,7 @@
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      `system` = #{record.system,jdbcType=BIT},
+      internal = #{record.internal,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR}
@@ -215,8 +215,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        `system` = #{system,jdbcType=BIT},
+      <if test="internal != null">
+        internal = #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -234,7 +234,7 @@
     update api_template
     set `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      `system` = #{system,jdbcType=BIT},
+      internal = #{internal,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       create_user = #{createUser,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR}

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="system" jdbcType="BIT" property="system" />
+    <result column="internal" jdbcType="BIT" property="internal" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, description, `system`, create_time, create_user, project_id
+    id, `name`, description, internal, create_time, create_user, project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.BugTemplateExample" resultMap="BaseResultMap">
     select
@@ -103,10 +103,10 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.BugTemplate">
     insert into bug_template (id, `name`, description, 
-      `system`, create_time, create_user, 
+      internal, create_time, create_user, 
       project_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{system,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
+      #{internal,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
       #{projectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.BugTemplate">
@@ -121,8 +121,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="system != null">
-        `system`,
+      <if test="internal != null">
+        internal,
       </if>
       <if test="createTime != null">
         create_time,
@@ -144,8 +144,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        #{system,jdbcType=BIT},
+      <if test="internal != null">
+        #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -176,8 +176,8 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.system != null">
-        `system` = #{record.system,jdbcType=BIT},
+      <if test="record.internal != null">
+        internal = #{record.internal,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -198,7 +198,7 @@
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      `system` = #{record.system,jdbcType=BIT},
+      internal = #{record.internal,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR}
@@ -215,8 +215,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        `system` = #{system,jdbcType=BIT},
+      <if test="internal != null">
+        internal = #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -234,7 +234,7 @@
     update bug_template
     set `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      `system` = #{system,jdbcType=BIT},
+      internal = #{internal,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       create_user = #{createUser,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR}

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="system" jdbcType="BIT" property="system" />
+    <result column="internal" jdbcType="BIT" property="internal" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
@@ -69,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, description, `system`, create_time, create_user, project_id
+    id, `name`, description, internal, create_time, create_user, project_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.FunctionalCaseTemplateExample" resultMap="BaseResultMap">
     select
@@ -103,10 +103,10 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.FunctionalCaseTemplate">
     insert into functional_case_template (id, `name`, description, 
-      `system`, create_time, create_user, 
+      internal, create_time, create_user, 
       project_id)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{system,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
+      #{internal,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, 
       #{projectId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.FunctionalCaseTemplate">
@@ -121,8 +121,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="system != null">
-        `system`,
+      <if test="internal != null">
+        internal,
       </if>
       <if test="createTime != null">
         create_time,
@@ -144,8 +144,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        #{system,jdbcType=BIT},
+      <if test="internal != null">
+        #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -176,8 +176,8 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.system != null">
-        `system` = #{record.system,jdbcType=BIT},
+      <if test="record.internal != null">
+        internal = #{record.internal,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -198,7 +198,7 @@
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      `system` = #{record.system,jdbcType=BIT},
+      internal = #{record.internal,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       project_id = #{record.projectId,jdbcType=VARCHAR}
@@ -215,8 +215,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        `system` = #{system,jdbcType=BIT},
+      <if test="internal != null">
+        internal = #{internal,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -234,7 +234,7 @@
     update functional_case_template
     set `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      `system` = #{system,jdbcType=BIT},
+      internal = #{internal,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       create_user = #{createUser,jdbcType=VARCHAR},
       project_id = #{projectId,jdbcType=VARCHAR}

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

@@ -16,21 +16,15 @@ public interface ProjectExtendMapper {
 
     int insertSelective(ProjectExtend record);
 
-    List<ProjectExtend> selectByExampleWithBLOBs(ProjectExtendExample example);
-
     List<ProjectExtend> selectByExample(ProjectExtendExample example);
 
     ProjectExtend selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") ProjectExtend record, @Param("example") ProjectExtendExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") ProjectExtend record, @Param("example") ProjectExtendExample example);
-
     int updateByExample(@Param("record") ProjectExtend record, @Param("example") ProjectExtendExample example);
 
     int updateByPrimaryKeySelective(ProjectExtend record);
 
-    int updateByPrimaryKeyWithBLOBs(ProjectExtend record);
-
     int updateByPrimaryKey(ProjectExtend record);
 }

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

@@ -12,11 +12,9 @@
     <result column="platform" jdbcType="VARCHAR" property="platform" />
     <result column="third_part_template" jdbcType="BIT" property="thirdPartTemplate" />
     <result column="version_enable" jdbcType="BIT" property="versionEnable" />
+    <result column="issue_config" jdbcType="VARCHAR" property="issueConfig" />
     <result column="api_template_id" jdbcType="VARCHAR" property="apiTemplateId" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.ProjectExtend">
-    <result column="issue_config" jdbcType="LONGVARBINARY" property="issueConfig" />
-  </resultMap>
   <sql id="Example_Where_Clause">
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -77,27 +75,8 @@
   </sql>
   <sql id="Base_Column_List">
     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
+    platform, third_part_template, version_enable, issue_config, api_template_id
   </sql>
-  <sql id="Blob_Column_List">
-    issue_config
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.project.domain.ProjectExtendExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from project_extend
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.ProjectExtendExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -112,11 +91,9 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from project_extend
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -134,12 +111,12 @@
     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
+      version_enable, issue_config, api_template_id
       )
     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}
+      #{versionEnable,jdbcType=BIT}, #{issueConfig,jdbcType=VARCHAR}, #{apiTemplateId,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.ProjectExtend">
@@ -175,12 +152,12 @@
       <if test="versionEnable != null">
         version_enable,
       </if>
-      <if test="apiTemplateId != null">
-        api_template_id,
-      </if>
       <if test="issueConfig != null">
         issue_config,
       </if>
+      <if test="apiTemplateId != null">
+        api_template_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -213,12 +190,12 @@
       <if test="versionEnable != null">
         #{versionEnable,jdbcType=BIT},
       </if>
+      <if test="issueConfig != null">
+        #{issueConfig,jdbcType=VARCHAR},
+      </if>
       <if test="apiTemplateId != null">
         #{apiTemplateId,jdbcType=VARCHAR},
       </if>
-      <if test="issueConfig != null">
-        #{issueConfig,jdbcType=LONGVARBINARY},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.project.domain.ProjectExtendExample" resultType="java.lang.Long">
@@ -260,35 +237,17 @@
       <if test="record.versionEnable != null">
         version_enable = #{record.versionEnable,jdbcType=BIT},
       </if>
+      <if test="record.issueConfig != null">
+        issue_config = #{record.issueConfig,jdbcType=VARCHAR},
+      </if>
       <if test="record.apiTemplateId != null">
         api_template_id = #{record.apiTemplateId,jdbcType=VARCHAR},
       </if>
-      <if test="record.issueConfig != null">
-        issue_config = #{record.issueConfig,jdbcType=LONGVARBINARY},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update project_extend
-    set id = #{record.id,jdbcType=VARCHAR},
-      tapd_id = #{record.tapdId,jdbcType=VARCHAR},
-      jira_key = #{record.jiraKey,jdbcType=VARCHAR},
-      zentao_id = #{record.zentaoId,jdbcType=VARCHAR},
-      azure_devops_id = #{record.azureDevopsId,jdbcType=VARCHAR},
-      case_template_id = #{record.caseTemplateId,jdbcType=VARCHAR},
-      azure_filter_id = #{record.azureFilterId,jdbcType=VARCHAR},
-      platform = #{record.platform,jdbcType=VARCHAR},
-      third_part_template = #{record.thirdPartTemplate,jdbcType=BIT},
-      version_enable = #{record.versionEnable,jdbcType=BIT},
-      api_template_id = #{record.apiTemplateId,jdbcType=VARCHAR},
-      issue_config = #{record.issueConfig,jdbcType=LONGVARBINARY}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update project_extend
     set id = #{record.id,jdbcType=VARCHAR},
@@ -301,6 +260,7 @@
       platform = #{record.platform,jdbcType=VARCHAR},
       third_part_template = #{record.thirdPartTemplate,jdbcType=BIT},
       version_enable = #{record.versionEnable,jdbcType=BIT},
+      issue_config = #{record.issueConfig,jdbcType=VARCHAR},
       api_template_id = #{record.apiTemplateId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -336,30 +296,15 @@
       <if test="versionEnable != null">
         version_enable = #{versionEnable,jdbcType=BIT},
       </if>
+      <if test="issueConfig != null">
+        issue_config = #{issueConfig,jdbcType=VARCHAR},
+      </if>
       <if test="apiTemplateId != null">
         api_template_id = #{apiTemplateId,jdbcType=VARCHAR},
       </if>
-      <if test="issueConfig != null">
-        issue_config = #{issueConfig,jdbcType=LONGVARBINARY},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.ProjectExtend">
-    update project_extend
-    set tapd_id = #{tapdId,jdbcType=VARCHAR},
-      jira_key = #{jiraKey,jdbcType=VARCHAR},
-      zentao_id = #{zentaoId,jdbcType=VARCHAR},
-      azure_devops_id = #{azureDevopsId,jdbcType=VARCHAR},
-      case_template_id = #{caseTemplateId,jdbcType=VARCHAR},
-      azure_filter_id = #{azureFilterId,jdbcType=VARCHAR},
-      platform = #{platform,jdbcType=VARCHAR},
-      third_part_template = #{thirdPartTemplate,jdbcType=BIT},
-      version_enable = #{versionEnable,jdbcType=BIT},
-      api_template_id = #{apiTemplateId,jdbcType=VARCHAR},
-      issue_config = #{issueConfig,jdbcType=LONGVARBINARY}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.ProjectExtend">
     update project_extend
     set tapd_id = #{tapdId,jdbcType=VARCHAR},
@@ -371,6 +316,7 @@
       platform = #{platform,jdbcType=VARCHAR},
       third_part_template = #{thirdPartTemplate,jdbcType=BIT},
       version_enable = #{versionEnable,jdbcType=BIT},
+      issue_config = #{issueConfig,jdbcType=VARCHAR},
       api_template_id = #{apiTemplateId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>

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

@@ -3,13 +3,17 @@
 <mapper namespace="io.metersphere.project.mapper.ProjectMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.project.domain.Project">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="num" jdbcType="BIGINT" property="num" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
-    <result column="system_id" jdbcType="VARCHAR" property="systemId" />
+    <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+    <result column="delete_user" jdbcType="VARCHAR" property="deleteUser" />
+    <result column="enable" jdbcType="BIT" property="enable" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,8 +74,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, organization_id, `name`, description, create_time, update_time, create_user, 
-    system_id
+    id, num, organization_id, `name`, description, create_time, update_time, create_user, 
+    delete_time, deleted, delete_user, `enable`
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.project.domain.ProjectExample" resultMap="BaseResultMap">
     select
@@ -104,12 +108,16 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.project.domain.Project">
-    insert into project (id, organization_id, `name`, 
-      description, create_time, update_time, 
-      create_user, system_id)
-    values (#{id,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{createUser,jdbcType=VARCHAR}, #{systemId,jdbcType=VARCHAR})
+    insert into project (id, num, organization_id, 
+      `name`, description, create_time, 
+      update_time, create_user, delete_time, 
+      deleted, delete_user, `enable`
+      )
+    values (#{id,jdbcType=VARCHAR}, #{num,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, 
+      #{deleted,jdbcType=BIT}, #{deleteUser,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.project.domain.Project">
     insert into project
@@ -117,6 +125,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="num != null">
+        num,
+      </if>
       <if test="organizationId != null">
         organization_id,
       </if>
@@ -135,14 +146,26 @@
       <if test="createUser != null">
         create_user,
       </if>
-      <if test="systemId != null">
-        system_id,
+      <if test="deleteTime != null">
+        delete_time,
+      </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+      <if test="deleteUser != null">
+        delete_user,
+      </if>
+      <if test="enable != null">
+        `enable`,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="num != null">
+        #{num,jdbcType=BIGINT},
+      </if>
       <if test="organizationId != null">
         #{organizationId,jdbcType=VARCHAR},
       </if>
@@ -161,8 +184,17 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="systemId != null">
-        #{systemId,jdbcType=VARCHAR},
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deleteUser != null">
+        #{deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="enable != null">
+        #{enable,jdbcType=BIT},
       </if>
     </trim>
   </insert>
@@ -178,6 +210,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.num != null">
+        num = #{record.num,jdbcType=BIGINT},
+      </if>
       <if test="record.organizationId != null">
         organization_id = #{record.organizationId,jdbcType=VARCHAR},
       </if>
@@ -196,8 +231,17 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.systemId != null">
-        system_id = #{record.systemId,jdbcType=VARCHAR},
+      <if test="record.deleteTime != null">
+        delete_time = #{record.deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=BIT},
+      </if>
+      <if test="record.deleteUser != null">
+        delete_user = #{record.deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.enable != null">
+        `enable` = #{record.enable,jdbcType=BIT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -207,13 +251,17 @@
   <update id="updateByExample" parameterType="map">
     update project
     set id = #{record.id,jdbcType=VARCHAR},
+      num = #{record.num,jdbcType=BIGINT},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       create_user = #{record.createUser,jdbcType=VARCHAR},
-      system_id = #{record.systemId,jdbcType=VARCHAR}
+      delete_time = #{record.deleteTime,jdbcType=BIGINT},
+      deleted = #{record.deleted,jdbcType=BIT},
+      delete_user = #{record.deleteUser,jdbcType=VARCHAR},
+      `enable` = #{record.enable,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -221,6 +269,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.project.domain.Project">
     update project
     <set>
+      <if test="num != null">
+        num = #{num,jdbcType=BIGINT},
+      </if>
       <if test="organizationId != null">
         organization_id = #{organizationId,jdbcType=VARCHAR},
       </if>
@@ -239,21 +290,34 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="systemId != null">
-        system_id = #{systemId,jdbcType=VARCHAR},
+      <if test="deleteTime != null">
+        delete_time = #{deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deleteUser != null">
+        delete_user = #{deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="enable != null">
+        `enable` = #{enable,jdbcType=BIT},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.Project">
     update project
-    set organization_id = #{organizationId,jdbcType=VARCHAR},
+    set num = #{num,jdbcType=BIGINT},
+      organization_id = #{organizationId,jdbcType=VARCHAR},
       `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       create_user = #{createUser,jdbcType=VARCHAR},
-      system_id = #{systemId,jdbcType=VARCHAR}
+      delete_time = #{deleteTime,jdbcType=BIGINT},
+      deleted = #{deleted,jdbcType=BIT},
+      delete_user = #{deleteUser,jdbcType=VARCHAR},
+      `enable` = #{enable,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSource.java

@@ -13,10 +13,9 @@ public class AuthSource implements Serializable {
     @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)
-    @NotBlank(message = "{auth_source.status.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 64, message = "{auth_source.status.length_range}", groups = {Created.class, Updated.class})
-    private String status;
+    @Schema(title = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{auth_source.enable.not_blank}", groups = {Created.class})
+    private Boolean enable;
 
     @Schema(title = "创建时间")
     private Long createTime;

backend/framework/domain/src/main/java/io/metersphere/system/domain/AuthSourceExample.java

@@ -174,73 +174,63 @@ public class AuthSourceExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("`status` is null");
+        public Criteria andEnableIsNull() {
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("`status` is not null");
+        public Criteria andEnableIsNotNull() {
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(String value) {
-            addCriterion("`status` =", value, "status");
+        public Criteria andEnableEqualTo(Boolean value) {
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(String value) {
-            addCriterion("`status` <>", value, "status");
+        public Criteria andEnableNotEqualTo(Boolean value) {
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(String value) {
-            addCriterion("`status` >", value, "status");
+        public Criteria andEnableGreaterThan(Boolean value) {
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("`status` >=", value, "status");
+        public Criteria andEnableGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(String value) {
-            addCriterion("`status` <", value, "status");
+        public Criteria andEnableLessThan(Boolean value) {
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(String value) {
-            addCriterion("`status` <=", value, "status");
+        public Criteria andEnableLessThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLike(String value) {
-            addCriterion("`status` like", value, "status");
+        public Criteria andEnableIn(List<Boolean> values) {
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotLike(String value) {
-            addCriterion("`status` not like", value, "status");
+        public Criteria andEnableNotIn(List<Boolean> values) {
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<String> values) {
-            addCriterion("`status` in", values, "status");
+        public Criteria andEnableBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<String> values) {
-            addCriterion("`status` not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(String value1, String value2) {
-            addCriterion("`status` between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(String value1, String value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+        public Criteria andEnableNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/system/domain/Organization.java

@@ -8,12 +8,16 @@ import lombok.Data;
 
 @Data
 public class Organization implements Serializable {
-    @Schema(title = "工作空间ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(title = "组织ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{organization.id.not_blank}", groups = {Updated.class})
     @Size(min = 1, max = 50, message = "{organization.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
-    @Schema(title = "工作空间名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(title = "组织编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{organization.num.not_blank}", groups = {Created.class})
+    private Long num;
+
+    @Schema(title = "组织名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{organization.name.not_blank}", groups = {Created.class})
     @Size(min = 1, max = 100, message = "{organization.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
@@ -30,5 +34,19 @@ public class Organization implements Serializable {
     @Schema(title = "创建人")
     private String createUser;
 
+    @Schema(title = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{organization.deleted.not_blank}", groups = {Created.class})
+    private Boolean deleted;
+
+    @Schema(title = "删除人")
+    private String deleteUser;
+
+    @Schema(title = "删除时间")
+    private Long deleteTime;
+
+    @Schema(title = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{organization.enable.not_blank}", groups = {Created.class})
+    private Boolean enable;
+
     private static final long serialVersionUID = 1L;
 }

backend/framework/domain/src/main/java/io/metersphere/system/domain/OrganizationExample.java

@@ -174,6 +174,66 @@ public class OrganizationExample {
             return (Criteria) this;
         }
 
+        public Criteria andNumIsNull() {
+            addCriterion("num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIsNotNull() {
+            addCriterion("num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumEqualTo(Long value) {
+            addCriterion("num =", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotEqualTo(Long value) {
+            addCriterion("num <>", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThan(Long value) {
+            addCriterion("num >", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThanOrEqualTo(Long value) {
+            addCriterion("num >=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThan(Long value) {
+            addCriterion("num <", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThanOrEqualTo(Long value) {
+            addCriterion("num <=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIn(List<Long> values) {
+            addCriterion("num in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotIn(List<Long> values) {
+            addCriterion("num not in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumBetween(Long value1, Long value2) {
+            addCriterion("num between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotBetween(Long value1, Long value2) {
+            addCriterion("num not between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
         public Criteria andNameIsNull() {
             addCriterion("`name` is null");
             return (Criteria) this;
@@ -503,6 +563,256 @@ public class OrganizationExample {
             addCriterion("create_user not between", value1, value2, "createUser");
             return (Criteria) this;
         }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIsNull() {
+            addCriterion("delete_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIsNotNull() {
+            addCriterion("delete_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserEqualTo(String value) {
+            addCriterion("delete_user =", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotEqualTo(String value) {
+            addCriterion("delete_user <>", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserGreaterThan(String value) {
+            addCriterion("delete_user >", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserGreaterThanOrEqualTo(String value) {
+            addCriterion("delete_user >=", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLessThan(String value) {
+            addCriterion("delete_user <", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLessThanOrEqualTo(String value) {
+            addCriterion("delete_user <=", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserLike(String value) {
+            addCriterion("delete_user like", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotLike(String value) {
+            addCriterion("delete_user not like", value, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserIn(List<String> values) {
+            addCriterion("delete_user in", values, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotIn(List<String> values) {
+            addCriterion("delete_user not in", values, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserBetween(String value1, String value2) {
+            addCriterion("delete_user between", value1, value2, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteUserNotBetween(String value1, String value2) {
+            addCriterion("delete_user not between", value1, value2, "deleteUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeIsNull() {
+            addCriterion("delete_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeIsNotNull() {
+            addCriterion("delete_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeEqualTo(Long value) {
+            addCriterion("delete_time =", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeNotEqualTo(Long value) {
+            addCriterion("delete_time <>", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeGreaterThan(Long value) {
+            addCriterion("delete_time >", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("delete_time >=", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeLessThan(Long value) {
+            addCriterion("delete_time <", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeLessThanOrEqualTo(Long value) {
+            addCriterion("delete_time <=", value, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeIn(List<Long> values) {
+            addCriterion("delete_time in", values, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeNotIn(List<Long> values) {
+            addCriterion("delete_time not in", values, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeBetween(Long value1, Long value2) {
+            addCriterion("delete_time between", value1, value2, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTimeNotBetween(Long value1, Long value2) {
+            addCriterion("delete_time not between", value1, value2, "deleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIsNull() {
+            addCriterion("`enable` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIsNotNull() {
+            addCriterion("`enable` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableEqualTo(Boolean value) {
+            addCriterion("`enable` =", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotEqualTo(Boolean value) {
+            addCriterion("`enable` <>", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableGreaterThan(Boolean value) {
+            addCriterion("`enable` >", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` >=", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableLessThan(Boolean value) {
+            addCriterion("`enable` <", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableLessThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` <=", value, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableIn(List<Boolean> values) {
+            addCriterion("`enable` in", values, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotIn(List<Boolean> values) {
+            addCriterion("`enable` not in", values, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` between", value1, value2, "enable");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` not between", value1, value2, "enable");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/framework/domain/src/main/java/io/metersphere/system/domain/Quota.java

@@ -14,24 +14,30 @@ public class Quota implements Serializable {
     @Size(min = 1, max = 50, message = "{quota.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
-    @Schema(title = "接口数量")
-    private Integer api;
+    @Schema(title = "组织ID")
+    private String organizationId;
 
-    @Schema(title = "性能测试数量")
-    private Integer performance;
+    @Schema(title = "项目类型配额")
+    private String projectId;
+
+    @Schema(title = "功能用例数量")
+    private Integer functionalCase;
+
+    @Schema(title = "总vum数")
+    private BigDecimal loadTestVumTotal;
+
+    @Schema(title = "消耗的vum数")
+    private BigDecimal loadTestVumUsed;
 
     @Schema(title = "最大并发数")
-    private Integer maxThreads;
+    private Integer loadTestMaxThreads;
 
     @Schema(title = "最大执行时长")
-    private Integer duration;
+    private Integer loadTestDuration;
 
     @Schema(title = "资源池列表")
     private String resourcePool;
 
-    @Schema(title = "组织ID")
-    private String organizationId;
-
     @Schema(title = "是否使用默认值")
     private Boolean useDefault;
 
@@ -44,14 +50,20 @@ public class Quota implements Serializable {
     @Schema(title = "项目数量限制")
     private Integer project;
 
-    @Schema(title = "项目类型配额")
-    private String projectId;
-
     @Schema(title = "总vum数")
-    private BigDecimal vumTotal;
+    private BigDecimal apiTestVumTotal;
 
     @Schema(title = "消耗的vum数")
-    private BigDecimal vumUsed;
+    private BigDecimal apiTestVumUsed;
+
+    @Schema(title = "总vum数")
+    private BigDecimal uiTestVumTotal;
+
+    @Schema(title = "消耗的vum数")
+    private BigDecimal uiTestVumUsed;
+
+    @Schema(title = "文件大小限制")
+    private Long fileStorage;
 
     private static final long serialVersionUID = 1L;
 }

backend/framework/domain/src/main/java/io/metersphere/system/domain/QuotaExample.java

@@ -175,243 +175,443 @@ public class QuotaExample {
             return (Criteria) this;
         }
 
-        public Criteria andApiIsNull() {
-            addCriterion("api is null");
+        public Criteria andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andApiIsNotNull() {
-            addCriterion("api is not null");
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andApiEqualTo(Integer value) {
-            addCriterion("api =", value, "api");
+        public Criteria andOrganizationIdEqualTo(String value) {
+            addCriterion("organization_id =", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotEqualTo(Integer value) {
-            addCriterion("api <>", value, "api");
+        public Criteria andOrganizationIdNotEqualTo(String value) {
+            addCriterion("organization_id <>", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiGreaterThan(Integer value) {
-            addCriterion("api >", value, "api");
+        public Criteria andOrganizationIdGreaterThan(String value) {
+            addCriterion("organization_id >", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiGreaterThanOrEqualTo(Integer value) {
-            addCriterion("api >=", value, "api");
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
+            addCriterion("organization_id >=", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiLessThan(Integer value) {
-            addCriterion("api <", value, "api");
+        public Criteria andOrganizationIdLessThan(String value) {
+            addCriterion("organization_id <", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiLessThanOrEqualTo(Integer value) {
-            addCriterion("api <=", value, "api");
+        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
+            addCriterion("organization_id <=", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiIn(List<Integer> values) {
-            addCriterion("api in", values, "api");
+        public Criteria andOrganizationIdLike(String value) {
+            addCriterion("organization_id like", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotIn(List<Integer> values) {
-            addCriterion("api not in", values, "api");
+        public Criteria andOrganizationIdNotLike(String value) {
+            addCriterion("organization_id not like", value, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiBetween(Integer value1, Integer value2) {
-            addCriterion("api between", value1, value2, "api");
+        public Criteria andOrganizationIdIn(List<String> values) {
+            addCriterion("organization_id in", values, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotBetween(Integer value1, Integer value2) {
-            addCriterion("api not between", value1, value2, "api");
+        public Criteria andOrganizationIdNotIn(List<String> values) {
+            addCriterion("organization_id not in", values, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIsNull() {
-            addCriterion("performance is null");
+        public Criteria andOrganizationIdBetween(String value1, String value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIsNotNull() {
-            addCriterion("performance is not null");
+        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceEqualTo(Integer value) {
-            addCriterion("performance =", value, "performance");
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotEqualTo(Integer value) {
-            addCriterion("performance <>", value, "performance");
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceGreaterThan(Integer value) {
-            addCriterion("performance >", value, "performance");
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceGreaterThanOrEqualTo(Integer value) {
-            addCriterion("performance >=", value, "performance");
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceLessThan(Integer value) {
-            addCriterion("performance <", value, "performance");
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceLessThanOrEqualTo(Integer value) {
-            addCriterion("performance <=", value, "performance");
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIn(List<Integer> values) {
-            addCriterion("performance in", values, "performance");
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotIn(List<Integer> values) {
-            addCriterion("performance not in", values, "performance");
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceBetween(Integer value1, Integer value2) {
-            addCriterion("performance between", value1, value2, "performance");
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotBetween(Integer value1, Integer value2) {
-            addCriterion("performance not between", value1, value2, "performance");
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsIsNull() {
-            addCriterion("max_threads is null");
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsIsNotNull() {
-            addCriterion("max_threads is not null");
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsEqualTo(Integer value) {
-            addCriterion("max_threads =", value, "maxThreads");
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsNotEqualTo(Integer value) {
-            addCriterion("max_threads <>", value, "maxThreads");
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsGreaterThan(Integer value) {
-            addCriterion("max_threads >", value, "maxThreads");
+        public Criteria andFunctionalCaseIsNull() {
+            addCriterion("functional_case is null");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsGreaterThanOrEqualTo(Integer value) {
-            addCriterion("max_threads >=", value, "maxThreads");
+        public Criteria andFunctionalCaseIsNotNull() {
+            addCriterion("functional_case is not null");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsLessThan(Integer value) {
-            addCriterion("max_threads <", value, "maxThreads");
+        public Criteria andFunctionalCaseEqualTo(Integer value) {
+            addCriterion("functional_case =", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsLessThanOrEqualTo(Integer value) {
-            addCriterion("max_threads <=", value, "maxThreads");
+        public Criteria andFunctionalCaseNotEqualTo(Integer value) {
+            addCriterion("functional_case <>", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsIn(List<Integer> values) {
-            addCriterion("max_threads in", values, "maxThreads");
+        public Criteria andFunctionalCaseGreaterThan(Integer value) {
+            addCriterion("functional_case >", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsNotIn(List<Integer> values) {
-            addCriterion("max_threads not in", values, "maxThreads");
+        public Criteria andFunctionalCaseGreaterThanOrEqualTo(Integer value) {
+            addCriterion("functional_case >=", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsBetween(Integer value1, Integer value2) {
-            addCriterion("max_threads between", value1, value2, "maxThreads");
+        public Criteria andFunctionalCaseLessThan(Integer value) {
+            addCriterion("functional_case <", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andMaxThreadsNotBetween(Integer value1, Integer value2) {
-            addCriterion("max_threads not between", value1, value2, "maxThreads");
+        public Criteria andFunctionalCaseLessThanOrEqualTo(Integer value) {
+            addCriterion("functional_case <=", value, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andDurationIsNull() {
-            addCriterion("duration is null");
+        public Criteria andFunctionalCaseIn(List<Integer> values) {
+            addCriterion("functional_case in", values, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andDurationIsNotNull() {
-            addCriterion("duration is not null");
+        public Criteria andFunctionalCaseNotIn(List<Integer> values) {
+            addCriterion("functional_case not in", values, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andDurationEqualTo(Integer value) {
-            addCriterion("duration =", value, "duration");
+        public Criteria andFunctionalCaseBetween(Integer value1, Integer value2) {
+            addCriterion("functional_case between", value1, value2, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotEqualTo(Integer value) {
-            addCriterion("duration <>", value, "duration");
+        public Criteria andFunctionalCaseNotBetween(Integer value1, Integer value2) {
+            addCriterion("functional_case not between", value1, value2, "functionalCase");
             return (Criteria) this;
         }
 
-        public Criteria andDurationGreaterThan(Integer value) {
-            addCriterion("duration >", value, "duration");
+        public Criteria andLoadTestVumTotalIsNull() {
+            addCriterion("load_test_vum_total is null");
             return (Criteria) this;
         }
 
-        public Criteria andDurationGreaterThanOrEqualTo(Integer value) {
-            addCriterion("duration >=", value, "duration");
+        public Criteria andLoadTestVumTotalIsNotNull() {
+            addCriterion("load_test_vum_total is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDurationLessThan(Integer value) {
-            addCriterion("duration <", value, "duration");
+        public Criteria andLoadTestVumTotalEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_total =", value, "loadTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andDurationLessThanOrEqualTo(Integer value) {
-            addCriterion("duration <=", value, "duration");
+        public Criteria andLoadTestVumTotalNotEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_total <>", value, "loadTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andDurationIn(List<Integer> values) {
-            addCriterion("duration in", values, "duration");
+        public Criteria andLoadTestVumTotalGreaterThan(BigDecimal value) {
+            addCriterion("load_test_vum_total >", value, "loadTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotIn(List<Integer> values) {
-            addCriterion("duration not in", values, "duration");
+        public Criteria andLoadTestVumTotalGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_total >=", value, "loadTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andDurationBetween(Integer value1, Integer value2) {
-            addCriterion("duration between", value1, value2, "duration");
+        public Criteria andLoadTestVumTotalLessThan(BigDecimal value) {
+            addCriterion("load_test_vum_total <", value, "loadTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andDurationNotBetween(Integer value1, Integer value2) {
-            addCriterion("duration not between", value1, value2, "duration");
+        public Criteria andLoadTestVumTotalLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_total <=", value, "loadTestVumTotal");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumTotalIn(List<BigDecimal> values) {
+            addCriterion("load_test_vum_total in", values, "loadTestVumTotal");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumTotalNotIn(List<BigDecimal> values) {
+            addCriterion("load_test_vum_total not in", values, "loadTestVumTotal");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumTotalBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("load_test_vum_total between", value1, value2, "loadTestVumTotal");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumTotalNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("load_test_vum_total not between", value1, value2, "loadTestVumTotal");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedIsNull() {
+            addCriterion("load_test_vum_used is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedIsNotNull() {
+            addCriterion("load_test_vum_used is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_used =", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedNotEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_used <>", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedGreaterThan(BigDecimal value) {
+            addCriterion("load_test_vum_used >", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_used >=", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedLessThan(BigDecimal value) {
+            addCriterion("load_test_vum_used <", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("load_test_vum_used <=", value, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedIn(List<BigDecimal> values) {
+            addCriterion("load_test_vum_used in", values, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedNotIn(List<BigDecimal> values) {
+            addCriterion("load_test_vum_used not in", values, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("load_test_vum_used between", value1, value2, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestVumUsedNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("load_test_vum_used not between", value1, value2, "loadTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsIsNull() {
+            addCriterion("load_test_max_threads is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsIsNotNull() {
+            addCriterion("load_test_max_threads is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsEqualTo(Integer value) {
+            addCriterion("load_test_max_threads =", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsNotEqualTo(Integer value) {
+            addCriterion("load_test_max_threads <>", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsGreaterThan(Integer value) {
+            addCriterion("load_test_max_threads >", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsGreaterThanOrEqualTo(Integer value) {
+            addCriterion("load_test_max_threads >=", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsLessThan(Integer value) {
+            addCriterion("load_test_max_threads <", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsLessThanOrEqualTo(Integer value) {
+            addCriterion("load_test_max_threads <=", value, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsIn(List<Integer> values) {
+            addCriterion("load_test_max_threads in", values, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsNotIn(List<Integer> values) {
+            addCriterion("load_test_max_threads not in", values, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsBetween(Integer value1, Integer value2) {
+            addCriterion("load_test_max_threads between", value1, value2, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestMaxThreadsNotBetween(Integer value1, Integer value2) {
+            addCriterion("load_test_max_threads not between", value1, value2, "loadTestMaxThreads");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationIsNull() {
+            addCriterion("load_test_duration is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationIsNotNull() {
+            addCriterion("load_test_duration is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationEqualTo(Integer value) {
+            addCriterion("load_test_duration =", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationNotEqualTo(Integer value) {
+            addCriterion("load_test_duration <>", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationGreaterThan(Integer value) {
+            addCriterion("load_test_duration >", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationGreaterThanOrEqualTo(Integer value) {
+            addCriterion("load_test_duration >=", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationLessThan(Integer value) {
+            addCriterion("load_test_duration <", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationLessThanOrEqualTo(Integer value) {
+            addCriterion("load_test_duration <=", value, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationIn(List<Integer> values) {
+            addCriterion("load_test_duration in", values, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationNotIn(List<Integer> values) {
+            addCriterion("load_test_duration not in", values, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationBetween(Integer value1, Integer value2) {
+            addCriterion("load_test_duration between", value1, value2, "loadTestDuration");
+            return (Criteria) this;
+        }
+
+        public Criteria andLoadTestDurationNotBetween(Integer value1, Integer value2) {
+            addCriterion("load_test_duration not between", value1, value2, "loadTestDuration");
             return (Criteria) this;
         }
 
@@ -485,76 +685,6 @@ public class QuotaExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrganizationIdIsNull() {
-            addCriterion("organization_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdIsNotNull() {
-            addCriterion("organization_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdEqualTo(String value) {
-            addCriterion("organization_id =", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotEqualTo(String value) {
-            addCriterion("organization_id <>", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdGreaterThan(String value) {
-            addCriterion("organization_id >", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
-            addCriterion("organization_id >=", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdLessThan(String value) {
-            addCriterion("organization_id <", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
-            addCriterion("organization_id <=", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdLike(String value) {
-            addCriterion("organization_id like", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotLike(String value) {
-            addCriterion("organization_id not like", value, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdIn(List<String> values) {
-            addCriterion("organization_id in", values, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotIn(List<String> values) {
-            addCriterion("organization_id not in", values, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdBetween(String value1, String value2) {
-            addCriterion("organization_id between", value1, value2, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
-            addCriterion("organization_id not between", value1, value2, "organizationId");
-            return (Criteria) this;
-        }
-
         public Criteria andUseDefaultIsNull() {
             addCriterion("use_default is null");
             return (Criteria) this;
@@ -795,193 +925,303 @@ public class QuotaExample {
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIsNull() {
-            addCriterion("project_id is null");
+        public Criteria andApiTestVumTotalIsNull() {
+            addCriterion("api_test_vum_total is null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIsNotNull() {
-            addCriterion("project_id is not null");
+        public Criteria andApiTestVumTotalIsNotNull() {
+            addCriterion("api_test_vum_total is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdEqualTo(String value) {
-            addCriterion("project_id =", value, "projectId");
+        public Criteria andApiTestVumTotalEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_total =", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotEqualTo(String value) {
-            addCriterion("project_id <>", value, "projectId");
+        public Criteria andApiTestVumTotalNotEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_total <>", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThan(String value) {
-            addCriterion("project_id >", value, "projectId");
+        public Criteria andApiTestVumTotalGreaterThan(BigDecimal value) {
+            addCriterion("api_test_vum_total >", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
-            addCriterion("project_id >=", value, "projectId");
+        public Criteria andApiTestVumTotalGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_total >=", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThan(String value) {
-            addCriterion("project_id <", value, "projectId");
+        public Criteria andApiTestVumTotalLessThan(BigDecimal value) {
+            addCriterion("api_test_vum_total <", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLessThanOrEqualTo(String value) {
-            addCriterion("project_id <=", value, "projectId");
+        public Criteria andApiTestVumTotalLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_total <=", value, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdLike(String value) {
-            addCriterion("project_id like", value, "projectId");
+        public Criteria andApiTestVumTotalIn(List<BigDecimal> values) {
+            addCriterion("api_test_vum_total in", values, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotLike(String value) {
-            addCriterion("project_id not like", value, "projectId");
+        public Criteria andApiTestVumTotalNotIn(List<BigDecimal> values) {
+            addCriterion("api_test_vum_total not in", values, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdIn(List<String> values) {
-            addCriterion("project_id in", values, "projectId");
+        public Criteria andApiTestVumTotalBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("api_test_vum_total between", value1, value2, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotIn(List<String> values) {
-            addCriterion("project_id not in", values, "projectId");
+        public Criteria andApiTestVumTotalNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("api_test_vum_total not between", value1, value2, "apiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdBetween(String value1, String value2) {
-            addCriterion("project_id between", value1, value2, "projectId");
+        public Criteria andApiTestVumUsedIsNull() {
+            addCriterion("api_test_vum_used is null");
             return (Criteria) this;
         }
 
-        public Criteria andProjectIdNotBetween(String value1, String value2) {
-            addCriterion("project_id not between", value1, value2, "projectId");
+        public Criteria andApiTestVumUsedIsNotNull() {
+            addCriterion("api_test_vum_used is not null");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalIsNull() {
-            addCriterion("vum_total is null");
+        public Criteria andApiTestVumUsedEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_used =", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalIsNotNull() {
-            addCriterion("vum_total is not null");
+        public Criteria andApiTestVumUsedNotEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_used <>", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalEqualTo(BigDecimal value) {
-            addCriterion("vum_total =", value, "vumTotal");
+        public Criteria andApiTestVumUsedGreaterThan(BigDecimal value) {
+            addCriterion("api_test_vum_used >", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalNotEqualTo(BigDecimal value) {
-            addCriterion("vum_total <>", value, "vumTotal");
+        public Criteria andApiTestVumUsedGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_used >=", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalGreaterThan(BigDecimal value) {
-            addCriterion("vum_total >", value, "vumTotal");
+        public Criteria andApiTestVumUsedLessThan(BigDecimal value) {
+            addCriterion("api_test_vum_used <", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("vum_total >=", value, "vumTotal");
+        public Criteria andApiTestVumUsedLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("api_test_vum_used <=", value, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalLessThan(BigDecimal value) {
-            addCriterion("vum_total <", value, "vumTotal");
+        public Criteria andApiTestVumUsedIn(List<BigDecimal> values) {
+            addCriterion("api_test_vum_used in", values, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("vum_total <=", value, "vumTotal");
+        public Criteria andApiTestVumUsedNotIn(List<BigDecimal> values) {
+            addCriterion("api_test_vum_used not in", values, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalIn(List<BigDecimal> values) {
-            addCriterion("vum_total in", values, "vumTotal");
+        public Criteria andApiTestVumUsedBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("api_test_vum_used between", value1, value2, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalNotIn(List<BigDecimal> values) {
-            addCriterion("vum_total not in", values, "vumTotal");
+        public Criteria andApiTestVumUsedNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("api_test_vum_used not between", value1, value2, "apiTestVumUsed");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("vum_total between", value1, value2, "vumTotal");
+        public Criteria andUiTestVumTotalIsNull() {
+            addCriterion("ui_test_vum_total is null");
             return (Criteria) this;
         }
 
-        public Criteria andVumTotalNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("vum_total not between", value1, value2, "vumTotal");
+        public Criteria andUiTestVumTotalIsNotNull() {
+            addCriterion("ui_test_vum_total is not null");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedIsNull() {
-            addCriterion("vum_used is null");
+        public Criteria andUiTestVumTotalEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_total =", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedIsNotNull() {
-            addCriterion("vum_used is not null");
+        public Criteria andUiTestVumTotalNotEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_total <>", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedEqualTo(BigDecimal value) {
-            addCriterion("vum_used =", value, "vumUsed");
+        public Criteria andUiTestVumTotalGreaterThan(BigDecimal value) {
+            addCriterion("ui_test_vum_total >", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedNotEqualTo(BigDecimal value) {
-            addCriterion("vum_used <>", value, "vumUsed");
+        public Criteria andUiTestVumTotalGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_total >=", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedGreaterThan(BigDecimal value) {
-            addCriterion("vum_used >", value, "vumUsed");
+        public Criteria andUiTestVumTotalLessThan(BigDecimal value) {
+            addCriterion("ui_test_vum_total <", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("vum_used >=", value, "vumUsed");
+        public Criteria andUiTestVumTotalLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_total <=", value, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedLessThan(BigDecimal value) {
-            addCriterion("vum_used <", value, "vumUsed");
+        public Criteria andUiTestVumTotalIn(List<BigDecimal> values) {
+            addCriterion("ui_test_vum_total in", values, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("vum_used <=", value, "vumUsed");
+        public Criteria andUiTestVumTotalNotIn(List<BigDecimal> values) {
+            addCriterion("ui_test_vum_total not in", values, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedIn(List<BigDecimal> values) {
-            addCriterion("vum_used in", values, "vumUsed");
+        public Criteria andUiTestVumTotalBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ui_test_vum_total between", value1, value2, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedNotIn(List<BigDecimal> values) {
-            addCriterion("vum_used not in", values, "vumUsed");
+        public Criteria andUiTestVumTotalNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ui_test_vum_total not between", value1, value2, "uiTestVumTotal");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("vum_used between", value1, value2, "vumUsed");
+        public Criteria andUiTestVumUsedIsNull() {
+            addCriterion("ui_test_vum_used is null");
             return (Criteria) this;
         }
 
-        public Criteria andVumUsedNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("vum_used not between", value1, value2, "vumUsed");
+        public Criteria andUiTestVumUsedIsNotNull() {
+            addCriterion("ui_test_vum_used is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_used =", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedNotEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_used <>", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedGreaterThan(BigDecimal value) {
+            addCriterion("ui_test_vum_used >", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_used >=", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedLessThan(BigDecimal value) {
+            addCriterion("ui_test_vum_used <", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ui_test_vum_used <=", value, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedIn(List<BigDecimal> values) {
+            addCriterion("ui_test_vum_used in", values, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedNotIn(List<BigDecimal> values) {
+            addCriterion("ui_test_vum_used not in", values, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ui_test_vum_used between", value1, value2, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestVumUsedNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ui_test_vum_used not between", value1, value2, "uiTestVumUsed");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageIsNull() {
+            addCriterion("file_storage is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageIsNotNull() {
+            addCriterion("file_storage is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageEqualTo(Long value) {
+            addCriterion("file_storage =", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageNotEqualTo(Long value) {
+            addCriterion("file_storage <>", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageGreaterThan(Long value) {
+            addCriterion("file_storage >", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageGreaterThanOrEqualTo(Long value) {
+            addCriterion("file_storage >=", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageLessThan(Long value) {
+            addCriterion("file_storage <", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageLessThanOrEqualTo(Long value) {
+            addCriterion("file_storage <=", value, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageIn(List<Long> values) {
+            addCriterion("file_storage in", values, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageNotIn(List<Long> values) {
+            addCriterion("file_storage not in", values, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageBetween(Long value1, Long value2) {
+            addCriterion("file_storage between", value1, value2, "fileStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileStorageNotBetween(Long value1, Long value2) {
+            addCriterion("file_storage not between", value1, value2, "fileStorage");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/system/domain/Schedule.java

@@ -34,7 +34,7 @@ public class Schedule implements Serializable {
     @Schema(title = "是否开启")
     private Boolean enable;
 
-    @Schema(title = "")
+    @Schema(title = "资源ID，api_scenario ui_scenario load_test")
     private String resourceId;
 
     @Schema(title = "创建人")

backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java

@@ -26,10 +26,9 @@ public class TestResourcePool implements Serializable {
     @Schema(title = "描述")
     private String description;
 
-    @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{test_resource_pool.status.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 20, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class})
-    private String status;
+    @Schema(title = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{test_resource_pool.enable.not_blank}", groups = {Created.class})
+    private Boolean enable;
 
     @Schema(title = "创建时间")
     private Long createTime;
@@ -38,22 +37,32 @@ public class TestResourcePool implements Serializable {
     private Long updateTime;
 
     @Schema(title = "性能测试镜像")
-    private String image;
+    private String loadTestImage;
 
     @Schema(title = "性能测试jvm配置")
-    private String heap;
-
-    @Schema(title = "性能测试gc配置")
-    private String gcAlgo;
+    private String loadTestHeap;
 
     @Schema(title = "创建人")
     private String createUser;
 
     @Schema(title = "是否用于接口测试")
-    private Boolean api;
+    private Boolean apiTest;
 
     @Schema(title = "是否用于性能测试")
-    private Boolean performance;
+    private Boolean loadTest;
+
+    @Schema(title = "是否用于ui测试")
+    private Boolean uiTest;
+
+    @Schema(title = "ui测试grid配置")
+    private String grid;
+
+    @Schema(title = "ms部署地址")
+    private String serverUrl;
+
+    @Schema(title = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{test_resource_pool.deleted.not_blank}", groups = {Created.class})
+    private Boolean deleted;
 
     private static final long serialVersionUID = 1L;
 }

backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePoolExample.java

@@ -384,73 +384,63 @@ public class TestResourcePoolExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("`status` is null");
+        public Criteria andEnableIsNull() {
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("`status` is not null");
+        public Criteria andEnableIsNotNull() {
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(String value) {
-            addCriterion("`status` =", value, "status");
+        public Criteria andEnableEqualTo(Boolean value) {
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(String value) {
-            addCriterion("`status` <>", value, "status");
+        public Criteria andEnableNotEqualTo(Boolean value) {
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(String value) {
-            addCriterion("`status` >", value, "status");
+        public Criteria andEnableGreaterThan(Boolean value) {
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("`status` >=", value, "status");
+        public Criteria andEnableGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(String value) {
-            addCriterion("`status` <", value, "status");
+        public Criteria andEnableLessThan(Boolean value) {
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(String value) {
-            addCriterion("`status` <=", value, "status");
+        public Criteria andEnableLessThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLike(String value) {
-            addCriterion("`status` like", value, "status");
+        public Criteria andEnableIn(List<Boolean> values) {
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotLike(String value) {
-            addCriterion("`status` not like", value, "status");
+        public Criteria andEnableNotIn(List<Boolean> values) {
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<String> values) {
-            addCriterion("`status` in", values, "status");
+        public Criteria andEnableBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<String> values) {
-            addCriterion("`status` not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(String value1, String value2) {
-            addCriterion("`status` between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(String value1, String value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+        public Criteria andEnableNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 
@@ -574,213 +564,143 @@ public class TestResourcePoolExample {
             return (Criteria) this;
         }
 
-        public Criteria andImageIsNull() {
-            addCriterion("image is null");
+        public Criteria andLoadTestImageIsNull() {
+            addCriterion("load_test_image is null");
             return (Criteria) this;
         }
 
-        public Criteria andImageIsNotNull() {
-            addCriterion("image is not null");
+        public Criteria andLoadTestImageIsNotNull() {
+            addCriterion("load_test_image is not null");
             return (Criteria) this;
         }
 
-        public Criteria andImageEqualTo(String value) {
-            addCriterion("image =", value, "image");
+        public Criteria andLoadTestImageEqualTo(String value) {
+            addCriterion("load_test_image =", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageNotEqualTo(String value) {
-            addCriterion("image <>", value, "image");
+        public Criteria andLoadTestImageNotEqualTo(String value) {
+            addCriterion("load_test_image <>", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageGreaterThan(String value) {
-            addCriterion("image >", value, "image");
+        public Criteria andLoadTestImageGreaterThan(String value) {
+            addCriterion("load_test_image >", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageGreaterThanOrEqualTo(String value) {
-            addCriterion("image >=", value, "image");
+        public Criteria andLoadTestImageGreaterThanOrEqualTo(String value) {
+            addCriterion("load_test_image >=", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageLessThan(String value) {
-            addCriterion("image <", value, "image");
+        public Criteria andLoadTestImageLessThan(String value) {
+            addCriterion("load_test_image <", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageLessThanOrEqualTo(String value) {
-            addCriterion("image <=", value, "image");
+        public Criteria andLoadTestImageLessThanOrEqualTo(String value) {
+            addCriterion("load_test_image <=", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageLike(String value) {
-            addCriterion("image like", value, "image");
+        public Criteria andLoadTestImageLike(String value) {
+            addCriterion("load_test_image like", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageNotLike(String value) {
-            addCriterion("image not like", value, "image");
+        public Criteria andLoadTestImageNotLike(String value) {
+            addCriterion("load_test_image not like", value, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageIn(List<String> values) {
-            addCriterion("image in", values, "image");
+        public Criteria andLoadTestImageIn(List<String> values) {
+            addCriterion("load_test_image in", values, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageNotIn(List<String> values) {
-            addCriterion("image not in", values, "image");
+        public Criteria andLoadTestImageNotIn(List<String> values) {
+            addCriterion("load_test_image not in", values, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageBetween(String value1, String value2) {
-            addCriterion("image between", value1, value2, "image");
+        public Criteria andLoadTestImageBetween(String value1, String value2) {
+            addCriterion("load_test_image between", value1, value2, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andImageNotBetween(String value1, String value2) {
-            addCriterion("image not between", value1, value2, "image");
+        public Criteria andLoadTestImageNotBetween(String value1, String value2) {
+            addCriterion("load_test_image not between", value1, value2, "loadTestImage");
             return (Criteria) this;
         }
 
-        public Criteria andHeapIsNull() {
-            addCriterion("`heap` is null");
+        public Criteria andLoadTestHeapIsNull() {
+            addCriterion("load_test_heap is null");
             return (Criteria) this;
         }
 
-        public Criteria andHeapIsNotNull() {
-            addCriterion("`heap` is not null");
+        public Criteria andLoadTestHeapIsNotNull() {
+            addCriterion("load_test_heap is not null");
             return (Criteria) this;
         }
 
-        public Criteria andHeapEqualTo(String value) {
-            addCriterion("`heap` =", value, "heap");
+        public Criteria andLoadTestHeapEqualTo(String value) {
+            addCriterion("load_test_heap =", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapNotEqualTo(String value) {
-            addCriterion("`heap` <>", value, "heap");
+        public Criteria andLoadTestHeapNotEqualTo(String value) {
+            addCriterion("load_test_heap <>", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapGreaterThan(String value) {
-            addCriterion("`heap` >", value, "heap");
+        public Criteria andLoadTestHeapGreaterThan(String value) {
+            addCriterion("load_test_heap >", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapGreaterThanOrEqualTo(String value) {
-            addCriterion("`heap` >=", value, "heap");
+        public Criteria andLoadTestHeapGreaterThanOrEqualTo(String value) {
+            addCriterion("load_test_heap >=", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapLessThan(String value) {
-            addCriterion("`heap` <", value, "heap");
+        public Criteria andLoadTestHeapLessThan(String value) {
+            addCriterion("load_test_heap <", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapLessThanOrEqualTo(String value) {
-            addCriterion("`heap` <=", value, "heap");
+        public Criteria andLoadTestHeapLessThanOrEqualTo(String value) {
+            addCriterion("load_test_heap <=", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapLike(String value) {
-            addCriterion("`heap` like", value, "heap");
+        public Criteria andLoadTestHeapLike(String value) {
+            addCriterion("load_test_heap like", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapNotLike(String value) {
-            addCriterion("`heap` not like", value, "heap");
+        public Criteria andLoadTestHeapNotLike(String value) {
+            addCriterion("load_test_heap not like", value, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapIn(List<String> values) {
-            addCriterion("`heap` in", values, "heap");
+        public Criteria andLoadTestHeapIn(List<String> values) {
+            addCriterion("load_test_heap in", values, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapNotIn(List<String> values) {
-            addCriterion("`heap` not in", values, "heap");
+        public Criteria andLoadTestHeapNotIn(List<String> values) {
+            addCriterion("load_test_heap not in", values, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapBetween(String value1, String value2) {
-            addCriterion("`heap` between", value1, value2, "heap");
+        public Criteria andLoadTestHeapBetween(String value1, String value2) {
+            addCriterion("load_test_heap between", value1, value2, "loadTestHeap");
             return (Criteria) this;
         }
 
-        public Criteria andHeapNotBetween(String value1, String value2) {
-            addCriterion("`heap` not between", value1, value2, "heap");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoIsNull() {
-            addCriterion("gc_algo is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoIsNotNull() {
-            addCriterion("gc_algo is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoEqualTo(String value) {
-            addCriterion("gc_algo =", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoNotEqualTo(String value) {
-            addCriterion("gc_algo <>", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoGreaterThan(String value) {
-            addCriterion("gc_algo >", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoGreaterThanOrEqualTo(String value) {
-            addCriterion("gc_algo >=", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoLessThan(String value) {
-            addCriterion("gc_algo <", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoLessThanOrEqualTo(String value) {
-            addCriterion("gc_algo <=", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoLike(String value) {
-            addCriterion("gc_algo like", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoNotLike(String value) {
-            addCriterion("gc_algo not like", value, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoIn(List<String> values) {
-            addCriterion("gc_algo in", values, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoNotIn(List<String> values) {
-            addCriterion("gc_algo not in", values, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoBetween(String value1, String value2) {
-            addCriterion("gc_algo between", value1, value2, "gcAlgo");
-            return (Criteria) this;
-        }
-
-        public Criteria andGcAlgoNotBetween(String value1, String value2) {
-            addCriterion("gc_algo not between", value1, value2, "gcAlgo");
+        public Criteria andLoadTestHeapNotBetween(String value1, String value2) {
+            addCriterion("load_test_heap not between", value1, value2, "loadTestHeap");
             return (Criteria) this;
         }
 
@@ -854,123 +774,383 @@ public class TestResourcePoolExample {
             return (Criteria) this;
         }
 
-        public Criteria andApiIsNull() {
-            addCriterion("api is null");
+        public Criteria andApiTestIsNull() {
+            addCriterion("api_test is null");
             return (Criteria) this;
         }
 
-        public Criteria andApiIsNotNull() {
-            addCriterion("api is not null");
+        public Criteria andApiTestIsNotNull() {
+            addCriterion("api_test is not null");
             return (Criteria) this;
         }
 
-        public Criteria andApiEqualTo(Boolean value) {
-            addCriterion("api =", value, "api");
+        public Criteria andApiTestEqualTo(Boolean value) {
+            addCriterion("api_test =", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotEqualTo(Boolean value) {
-            addCriterion("api <>", value, "api");
+        public Criteria andApiTestNotEqualTo(Boolean value) {
+            addCriterion("api_test <>", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiGreaterThan(Boolean value) {
-            addCriterion("api >", value, "api");
+        public Criteria andApiTestGreaterThan(Boolean value) {
+            addCriterion("api_test >", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("api >=", value, "api");
+        public Criteria andApiTestGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("api_test >=", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiLessThan(Boolean value) {
-            addCriterion("api <", value, "api");
+        public Criteria andApiTestLessThan(Boolean value) {
+            addCriterion("api_test <", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiLessThanOrEqualTo(Boolean value) {
-            addCriterion("api <=", value, "api");
+        public Criteria andApiTestLessThanOrEqualTo(Boolean value) {
+            addCriterion("api_test <=", value, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiIn(List<Boolean> values) {
-            addCriterion("api in", values, "api");
+        public Criteria andApiTestIn(List<Boolean> values) {
+            addCriterion("api_test in", values, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotIn(List<Boolean> values) {
-            addCriterion("api not in", values, "api");
+        public Criteria andApiTestNotIn(List<Boolean> values) {
+            addCriterion("api_test not in", values, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiBetween(Boolean value1, Boolean value2) {
-            addCriterion("api between", value1, value2, "api");
+        public Criteria andApiTestBetween(Boolean value1, Boolean value2) {
+            addCriterion("api_test between", value1, value2, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andApiNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("api not between", value1, value2, "api");
+        public Criteria andApiTestNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("api_test not between", value1, value2, "apiTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIsNull() {
-            addCriterion("performance is null");
+        public Criteria andLoadTestIsNull() {
+            addCriterion("load_test is null");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIsNotNull() {
-            addCriterion("performance is not null");
+        public Criteria andLoadTestIsNotNull() {
+            addCriterion("load_test is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceEqualTo(Boolean value) {
-            addCriterion("performance =", value, "performance");
+        public Criteria andLoadTestEqualTo(Boolean value) {
+            addCriterion("load_test =", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotEqualTo(Boolean value) {
-            addCriterion("performance <>", value, "performance");
+        public Criteria andLoadTestNotEqualTo(Boolean value) {
+            addCriterion("load_test <>", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceGreaterThan(Boolean value) {
-            addCriterion("performance >", value, "performance");
+        public Criteria andLoadTestGreaterThan(Boolean value) {
+            addCriterion("load_test >", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("performance >=", value, "performance");
+        public Criteria andLoadTestGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("load_test >=", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceLessThan(Boolean value) {
-            addCriterion("performance <", value, "performance");
+        public Criteria andLoadTestLessThan(Boolean value) {
+            addCriterion("load_test <", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceLessThanOrEqualTo(Boolean value) {
-            addCriterion("performance <=", value, "performance");
+        public Criteria andLoadTestLessThanOrEqualTo(Boolean value) {
+            addCriterion("load_test <=", value, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceIn(List<Boolean> values) {
-            addCriterion("performance in", values, "performance");
+        public Criteria andLoadTestIn(List<Boolean> values) {
+            addCriterion("load_test in", values, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotIn(List<Boolean> values) {
-            addCriterion("performance not in", values, "performance");
+        public Criteria andLoadTestNotIn(List<Boolean> values) {
+            addCriterion("load_test not in", values, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceBetween(Boolean value1, Boolean value2) {
-            addCriterion("performance between", value1, value2, "performance");
+        public Criteria andLoadTestBetween(Boolean value1, Boolean value2) {
+            addCriterion("load_test between", value1, value2, "loadTest");
             return (Criteria) this;
         }
 
-        public Criteria andPerformanceNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("performance not between", value1, value2, "performance");
+        public Criteria andLoadTestNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("load_test not between", value1, value2, "loadTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestIsNull() {
+            addCriterion("ui_test is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestIsNotNull() {
+            addCriterion("ui_test is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestEqualTo(Boolean value) {
+            addCriterion("ui_test =", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestNotEqualTo(Boolean value) {
+            addCriterion("ui_test <>", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestGreaterThan(Boolean value) {
+            addCriterion("ui_test >", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("ui_test >=", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestLessThan(Boolean value) {
+            addCriterion("ui_test <", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestLessThanOrEqualTo(Boolean value) {
+            addCriterion("ui_test <=", value, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestIn(List<Boolean> values) {
+            addCriterion("ui_test in", values, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestNotIn(List<Boolean> values) {
+            addCriterion("ui_test not in", values, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestBetween(Boolean value1, Boolean value2) {
+            addCriterion("ui_test between", value1, value2, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andUiTestNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("ui_test not between", value1, value2, "uiTest");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridIsNull() {
+            addCriterion("grid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridIsNotNull() {
+            addCriterion("grid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridEqualTo(String value) {
+            addCriterion("grid =", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridNotEqualTo(String value) {
+            addCriterion("grid <>", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridGreaterThan(String value) {
+            addCriterion("grid >", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridGreaterThanOrEqualTo(String value) {
+            addCriterion("grid >=", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridLessThan(String value) {
+            addCriterion("grid <", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridLessThanOrEqualTo(String value) {
+            addCriterion("grid <=", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridLike(String value) {
+            addCriterion("grid like", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridNotLike(String value) {
+            addCriterion("grid not like", value, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridIn(List<String> values) {
+            addCriterion("grid in", values, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridNotIn(List<String> values) {
+            addCriterion("grid not in", values, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridBetween(String value1, String value2) {
+            addCriterion("grid between", value1, value2, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGridNotBetween(String value1, String value2) {
+            addCriterion("grid not between", value1, value2, "grid");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlIsNull() {
+            addCriterion("server_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlIsNotNull() {
+            addCriterion("server_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlEqualTo(String value) {
+            addCriterion("server_url =", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlNotEqualTo(String value) {
+            addCriterion("server_url <>", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlGreaterThan(String value) {
+            addCriterion("server_url >", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("server_url >=", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlLessThan(String value) {
+            addCriterion("server_url <", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlLessThanOrEqualTo(String value) {
+            addCriterion("server_url <=", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlLike(String value) {
+            addCriterion("server_url like", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlNotLike(String value) {
+            addCriterion("server_url not like", value, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlIn(List<String> values) {
+            addCriterion("server_url in", values, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlNotIn(List<String> values) {
+            addCriterion("server_url not in", values, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlBetween(String value1, String value2) {
+            addCriterion("server_url between", value1, value2, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andServerUrlNotBetween(String value1, String value2) {
+            addCriterion("server_url not between", value1, value2, "serverUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNull() {
+            addCriterion("deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIsNotNull() {
+            addCriterion("deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedEqualTo(Boolean value) {
+            addCriterion("deleted =", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotEqualTo(Boolean value) {
+            addCriterion("deleted <>", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThan(Boolean value) {
+            addCriterion("deleted >", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("deleted >=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThan(Boolean value) {
+            addCriterion("deleted <", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("deleted <=", value, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedIn(List<Boolean> values) {
+            addCriterion("deleted in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotIn(List<Boolean> values) {
+            addCriterion("deleted not in", values, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted between", value1, value2, "deleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("deleted not between", value1, value2, "deleted");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/system/domain/User.java

@@ -26,10 +26,9 @@ public class User implements Serializable {
     @Schema(title = "用户密码")
     private String password;
 
-    @Schema(title = "用户状态，启用或禁用", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{user.status.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{user.status.length_range}", groups = {Created.class, Updated.class})
-    private String status;
+    @Schema(title = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{user.enable.not_blank}", groups = {Created.class})
+    private Boolean enable;
 
     @Schema(title = "创建时间")
     private Long createTime;
@@ -46,7 +45,7 @@ public class User implements Serializable {
     @Schema(title = "手机号")
     private String phone;
 
-    @Schema(title = "来源：LOCAL OIDC CAS", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(title = "来源：LOCAL OIDC CAS OAUTH2", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user.source.not_blank}", groups = {Created.class})
     @Size(min = 1, max = 50, message = "{user.source.length_range}", groups = {Created.class, Updated.class})
     private String source;
@@ -57,5 +56,8 @@ public class User implements Serializable {
     @Schema(title = "创建人")
     private String createUser;
 
+    @Schema(title = "修改人")
+    private String updateUser;
+
     private static final long serialVersionUID = 1L;
 }

backend/framework/domain/src/main/java/io/metersphere/system/domain/UserExample.java

@@ -384,73 +384,63 @@ public class UserExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("`status` is null");
+        public Criteria andEnableIsNull() {
+            addCriterion("`enable` is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("`status` is not null");
+        public Criteria andEnableIsNotNull() {
+            addCriterion("`enable` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(String value) {
-            addCriterion("`status` =", value, "status");
+        public Criteria andEnableEqualTo(Boolean value) {
+            addCriterion("`enable` =", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(String value) {
-            addCriterion("`status` <>", value, "status");
+        public Criteria andEnableNotEqualTo(Boolean value) {
+            addCriterion("`enable` <>", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(String value) {
-            addCriterion("`status` >", value, "status");
+        public Criteria andEnableGreaterThan(Boolean value) {
+            addCriterion("`enable` >", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("`status` >=", value, "status");
+        public Criteria andEnableGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` >=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(String value) {
-            addCriterion("`status` <", value, "status");
+        public Criteria andEnableLessThan(Boolean value) {
+            addCriterion("`enable` <", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(String value) {
-            addCriterion("`status` <=", value, "status");
+        public Criteria andEnableLessThanOrEqualTo(Boolean value) {
+            addCriterion("`enable` <=", value, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLike(String value) {
-            addCriterion("`status` like", value, "status");
+        public Criteria andEnableIn(List<Boolean> values) {
+            addCriterion("`enable` in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotLike(String value) {
-            addCriterion("`status` not like", value, "status");
+        public Criteria andEnableNotIn(List<Boolean> values) {
+            addCriterion("`enable` not in", values, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<String> values) {
-            addCriterion("`status` in", values, "status");
+        public Criteria andEnableBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` between", value1, value2, "enable");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<String> values) {
-            addCriterion("`status` not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(String value1, String value2) {
-            addCriterion("`status` between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(String value1, String value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+        public Criteria andEnableNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`enable` not between", value1, value2, "enable");
             return (Criteria) this;
         }
 
@@ -993,6 +983,76 @@ public class UserExample {
             addCriterion("create_user not between", value1, value2, "createUser");
             return (Criteria) this;
         }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("update_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("update_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("update_user =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("update_user <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("update_user >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("update_user >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("update_user <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("update_user <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("update_user like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("update_user not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("update_user in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("update_user not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("update_user between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("update_user not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRole.java

@@ -21,11 +21,11 @@ public class UserRole implements Serializable {
     @Schema(title = "描述")
     private String description;
 
-    @Schema(title = "是否是系统用户组", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{user_role.system.not_blank}", groups = {Created.class})
-    private Boolean system;
+    @Schema(title = "是否是内置用户组", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{user_role.internal.not_blank}", groups = {Created.class})
+    private Boolean internal;
 
-    @Schema(title = "所属类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(title = "所属类型 SYSTEM ORGANIZATION PROJECT", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user_role.type.not_blank}", groups = {Created.class})
     @Size(min = 1, max = 20, message = "{user_role.type.length_range}", groups = {Created.class, Updated.class})
     private String type;

backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleExample.java

@@ -314,63 +314,63 @@ public class UserRoleExample {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNull() {
-            addCriterion("`system` is null");
+        public Criteria andInternalIsNull() {
+            addCriterion("internal is null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIsNotNull() {
-            addCriterion("`system` is not null");
+        public Criteria andInternalIsNotNull() {
+            addCriterion("internal is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSystemEqualTo(Boolean value) {
-            addCriterion("`system` =", value, "system");
+        public Criteria andInternalEqualTo(Boolean value) {
+            addCriterion("internal =", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotEqualTo(Boolean value) {
-            addCriterion("`system` <>", value, "system");
+        public Criteria andInternalNotEqualTo(Boolean value) {
+            addCriterion("internal <>", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThan(Boolean value) {
-            addCriterion("`system` >", value, "system");
+        public Criteria andInternalGreaterThan(Boolean value) {
+            addCriterion("internal >", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("`system` >=", value, "system");
+        public Criteria andInternalGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("internal >=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThan(Boolean value) {
-            addCriterion("`system` <", value, "system");
+        public Criteria andInternalLessThan(Boolean value) {
+            addCriterion("internal <", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemLessThanOrEqualTo(Boolean value) {
-            addCriterion("`system` <=", value, "system");
+        public Criteria andInternalLessThanOrEqualTo(Boolean value) {
+            addCriterion("internal <=", value, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemIn(List<Boolean> values) {
-            addCriterion("`system` in", values, "system");
+        public Criteria andInternalIn(List<Boolean> values) {
+            addCriterion("internal in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotIn(List<Boolean> values) {
-            addCriterion("`system` not in", values, "system");
+        public Criteria andInternalNotIn(List<Boolean> values) {
+            addCriterion("internal not in", values, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` between", value1, value2, "system");
+        public Criteria andInternalBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal between", value1, value2, "internal");
             return (Criteria) this;
         }
 
-        public Criteria andSystemNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("`system` not between", value1, value2, "system");
+        public Criteria andInternalNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("internal not between", value1, value2, "internal");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/system/domain/UserRoleRelation.java

@@ -23,7 +23,7 @@ public class UserRoleRelation implements Serializable {
     @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)
+    @Schema(title = "组织或项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user_role_relation.source_id.not_blank}", groups = {Created.class})
     @Size(min = 1, max = 50, message = "{user_role_relation.source_id.length_range}", groups = {Created.class, Updated.class})
     private String sourceId;

backend/framework/domain/src/main/java/io/metersphere/system/mapper/AuthSourceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="io.metersphere.system.mapper.AuthSourceMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.system.domain.AuthSource">
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="enable" jdbcType="BIT" property="enable" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="description" jdbcType="VARCHAR" property="description" />
@@ -72,7 +72,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `status`, create_time, update_time, description, `name`, `type`
+    id, `enable`, create_time, update_time, description, `name`, `type`
   </sql>
   <sql id="Blob_Column_List">
     configuration
@@ -126,10 +126,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.AuthSource">
-    insert into auth_source (id, `status`, create_time, 
+    insert into auth_source (id, `enable`, create_time, 
       update_time, description, `name`, 
       `type`, configuration)
-    values (#{id,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+    values (#{id,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{configuration,jdbcType=LONGVARBINARY})
   </insert>
@@ -139,8 +139,8 @@
       <if test="id != null">
         id,
       </if>
-      <if test="status != null">
-        `status`,
+      <if test="enable != null">
+        `enable`,
       </if>
       <if test="createTime != null">
         create_time,
@@ -165,8 +165,8 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -200,8 +200,8 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.status != null">
-        `status` = #{record.status,jdbcType=VARCHAR},
+      <if test="record.enable != null">
+        `enable` = #{record.enable,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -229,7 +229,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update auth_source
     set id = #{record.id,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
+      `enable` = #{record.enable,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       description = #{record.description,jdbcType=VARCHAR},
@@ -243,7 +243,7 @@
   <update id="updateByExample" parameterType="map">
     update auth_source
     set id = #{record.id,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
+      `enable` = #{record.enable,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       description = #{record.description,jdbcType=VARCHAR},
@@ -256,8 +256,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.system.domain.AuthSource">
     update auth_source
     <set>
-      <if test="status != null">
-        `status` = #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        `enable` = #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -282,7 +282,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.system.domain.AuthSource">
     update auth_source
-    set `status` = #{status,jdbcType=VARCHAR},
+    set `enable` = #{enable,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       description = #{description,jdbcType=VARCHAR},
@@ -293,7 +293,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.system.domain.AuthSource">
     update auth_source
-    set `status` = #{status,jdbcType=VARCHAR},
+    set `enable` = #{enable,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       description = #{description,jdbcType=VARCHAR},

backend/framework/domain/src/main/java/io/metersphere/system/mapper/OrganizationMapper.xml

@@ -3,11 +3,16 @@
 <mapper namespace="io.metersphere.system.mapper.OrganizationMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.system.domain.Organization">
     <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="num" jdbcType="BIGINT" property="num" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+    <result column="delete_user" jdbcType="VARCHAR" property="deleteUser" />
+    <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
+    <result column="enable" jdbcType="BIT" property="enable" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -68,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, description, create_time, update_time, create_user
+    id, num, `name`, description, create_time, update_time, create_user, deleted, delete_user, 
+    delete_time, `enable`
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.OrganizationExample" resultMap="BaseResultMap">
     select
@@ -101,12 +107,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.Organization">
-    insert into organization (id, `name`, description, 
-      create_time, update_time, create_user
-      )
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}
-      )
+    insert into organization (id, num, `name`, 
+      description, create_time, update_time, 
+      create_user, deleted, delete_user, 
+      delete_time, `enable`)
+    values (#{id,jdbcType=VARCHAR}, #{num,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
+      #{createUser,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT}, #{deleteUser,jdbcType=VARCHAR}, 
+      #{deleteTime,jdbcType=BIGINT}, #{enable,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.system.domain.Organization">
     insert into organization
@@ -114,6 +122,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="num != null">
+        num,
+      </if>
       <if test="name != null">
         `name`,
       </if>
@@ -129,11 +140,26 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="deleted != null">
+        deleted,
+      </if>
+      <if test="deleteUser != null">
+        delete_user,
+      </if>
+      <if test="deleteTime != null">
+        delete_time,
+      </if>
+      <if test="enable != null">
+        `enable`,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
+      <if test="num != null">
+        #{num,jdbcType=BIGINT},
+      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
@@ -149,6 +175,18 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deleteUser != null">
+        #{deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="enable != null">
+        #{enable,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.system.domain.OrganizationExample" resultType="java.lang.Long">
@@ -163,6 +201,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
+      <if test="record.num != null">
+        num = #{record.num,jdbcType=BIGINT},
+      </if>
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
       </if>
@@ -178,6 +219,18 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=BIT},
+      </if>
+      <if test="record.deleteUser != null">
+        delete_user = #{record.deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleteTime != null">
+        delete_time = #{record.deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.enable != null">
+        `enable` = #{record.enable,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -186,11 +239,16 @@
   <update id="updateByExample" parameterType="map">
     update organization
     set id = #{record.id,jdbcType=VARCHAR},
+      num = #{record.num,jdbcType=BIGINT},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      create_user = #{record.createUser,jdbcType=VARCHAR}
+      create_user = #{record.createUser,jdbcType=VARCHAR},
+      deleted = #{record.deleted,jdbcType=BIT},
+      delete_user = #{record.deleteUser,jdbcType=VARCHAR},
+      delete_time = #{record.deleteTime,jdbcType=BIGINT},
+      `enable` = #{record.enable,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -198,6 +256,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.system.domain.Organization">
     update organization
     <set>
+      <if test="num != null">
+        num = #{num,jdbcType=BIGINT},
+      </if>
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
@@ -213,16 +274,33 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=BIT},
+      </if>
+      <if test="deleteUser != null">
+        delete_user = #{deleteUser,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        delete_time = #{deleteTime,jdbcType=BIGINT},
+      </if>
+      <if test="enable != null">
+        `enable` = #{enable,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.system.domain.Organization">
     update organization
-    set `name` = #{name,jdbcType=VARCHAR},
+    set num = #{num,jdbcType=BIGINT},
+      `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-      create_user = #{createUser,jdbcType=VARCHAR}
+      create_user = #{createUser,jdbcType=VARCHAR},
+      deleted = #{deleted,jdbcType=BIT},
+      delete_user = #{deleteUser,jdbcType=VARCHAR},
+      delete_time = #{deleteTime,jdbcType=BIGINT},
+      `enable` = #{enable,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/system/mapper/QuotaMapper.xml

@@ -3,19 +3,23 @@
 <mapper namespace="io.metersphere.system.mapper.QuotaMapper">
   <resultMap id="BaseResultMap" type="io.metersphere.system.domain.Quota">
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="api" jdbcType="INTEGER" property="api" />
-    <result column="performance" jdbcType="INTEGER" property="performance" />
-    <result column="max_threads" jdbcType="INTEGER" property="maxThreads" />
-    <result column="duration" jdbcType="INTEGER" property="duration" />
-    <result column="resource_pool" jdbcType="VARCHAR" property="resourcePool" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="functional_case" jdbcType="INTEGER" property="functionalCase" />
+    <result column="load_test_vum_total" jdbcType="DECIMAL" property="loadTestVumTotal" />
+    <result column="load_test_vum_used" jdbcType="DECIMAL" property="loadTestVumUsed" />
+    <result column="load_test_max_threads" jdbcType="INTEGER" property="loadTestMaxThreads" />
+    <result column="load_test_duration" jdbcType="INTEGER" property="loadTestDuration" />
+    <result column="resource_pool" jdbcType="VARCHAR" property="resourcePool" />
     <result column="use_default" jdbcType="BIT" property="useDefault" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="member" jdbcType="INTEGER" property="member" />
     <result column="project" jdbcType="INTEGER" property="project" />
-    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
-    <result column="vum_total" jdbcType="DECIMAL" property="vumTotal" />
-    <result column="vum_used" jdbcType="DECIMAL" property="vumUsed" />
+    <result column="api_test_vum_total" jdbcType="DECIMAL" property="apiTestVumTotal" />
+    <result column="api_test_vum_used" jdbcType="DECIMAL" property="apiTestVumUsed" />
+    <result column="ui_test_vum_total" jdbcType="DECIMAL" property="uiTestVumTotal" />
+    <result column="ui_test_vum_used" jdbcType="DECIMAL" property="uiTestVumUsed" />
+    <result column="file_storage" jdbcType="BIGINT" property="fileStorage" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,8 +80,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, api, performance, max_threads, duration, resource_pool, organization_id, use_default, 
-    update_time, `member`, project, project_id, vum_total, vum_used
+    id, organization_id, project_id, functional_case, load_test_vum_total, load_test_vum_used, 
+    load_test_max_threads, load_test_duration, resource_pool, use_default, update_time, 
+    `member`, project, api_test_vum_total, api_test_vum_used, ui_test_vum_total, ui_test_vum_used, 
+    file_storage
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.QuotaExample" resultMap="BaseResultMap">
     select
@@ -110,16 +116,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.Quota">
-    insert into quota (id, api, performance, 
-      max_threads, duration, resource_pool, 
-      organization_id, use_default, update_time, 
-      `member`, project, project_id, 
-      vum_total, vum_used)
-    values (#{id,jdbcType=VARCHAR}, #{api,jdbcType=INTEGER}, #{performance,jdbcType=INTEGER}, 
-      #{maxThreads,jdbcType=INTEGER}, #{duration,jdbcType=INTEGER}, #{resourcePool,jdbcType=VARCHAR}, 
-      #{organizationId,jdbcType=VARCHAR}, #{useDefault,jdbcType=BIT}, #{updateTime,jdbcType=BIGINT}, 
-      #{member,jdbcType=INTEGER}, #{project,jdbcType=INTEGER}, #{projectId,jdbcType=VARCHAR}, 
-      #{vumTotal,jdbcType=DECIMAL}, #{vumUsed,jdbcType=DECIMAL})
+    insert into quota (id, organization_id, project_id, 
+      functional_case, load_test_vum_total, load_test_vum_used, 
+      load_test_max_threads, load_test_duration, resource_pool, 
+      use_default, update_time, `member`, 
+      project, api_test_vum_total, api_test_vum_used, 
+      ui_test_vum_total, ui_test_vum_used, file_storage
+      )
+    values (#{id,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
+      #{functionalCase,jdbcType=INTEGER}, #{loadTestVumTotal,jdbcType=DECIMAL}, #{loadTestVumUsed,jdbcType=DECIMAL}, 
+      #{loadTestMaxThreads,jdbcType=INTEGER}, #{loadTestDuration,jdbcType=INTEGER}, #{resourcePool,jdbcType=VARCHAR}, 
+      #{useDefault,jdbcType=BIT}, #{updateTime,jdbcType=BIGINT}, #{member,jdbcType=INTEGER}, 
+      #{project,jdbcType=INTEGER}, #{apiTestVumTotal,jdbcType=DECIMAL}, #{apiTestVumUsed,jdbcType=DECIMAL}, 
+      #{uiTestVumTotal,jdbcType=DECIMAL}, #{uiTestVumUsed,jdbcType=DECIMAL}, #{fileStorage,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.system.domain.Quota">
     insert into quota
@@ -127,24 +137,30 @@
       <if test="id != null">
         id,
       </if>
-      <if test="api != null">
-        api,
+      <if test="organizationId != null">
+        organization_id,
       </if>
-      <if test="performance != null">
-        performance,
+      <if test="projectId != null">
+        project_id,
       </if>
-      <if test="maxThreads != null">
-        max_threads,
+      <if test="functionalCase != null">
+        functional_case,
       </if>
-      <if test="duration != null">
-        duration,
+      <if test="loadTestVumTotal != null">
+        load_test_vum_total,
+      </if>
+      <if test="loadTestVumUsed != null">
+        load_test_vum_used,
+      </if>
+      <if test="loadTestMaxThreads != null">
+        load_test_max_threads,
+      </if>
+      <if test="loadTestDuration != null">
+        load_test_duration,
       </if>
       <if test="resourcePool != null">
         resource_pool,
       </if>
-      <if test="organizationId != null">
-        organization_id,
-      </if>
       <if test="useDefault != null">
         use_default,
       </if>
@@ -157,38 +173,50 @@
       <if test="project != null">
         project,
       </if>
-      <if test="projectId != null">
-        project_id,
+      <if test="apiTestVumTotal != null">
+        api_test_vum_total,
       </if>
-      <if test="vumTotal != null">
-        vum_total,
+      <if test="apiTestVumUsed != null">
+        api_test_vum_used,
       </if>
-      <if test="vumUsed != null">
-        vum_used,
+      <if test="uiTestVumTotal != null">
+        ui_test_vum_total,
+      </if>
+      <if test="uiTestVumUsed != null">
+        ui_test_vum_used,
+      </if>
+      <if test="fileStorage != null">
+        file_storage,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="api != null">
-        #{api,jdbcType=INTEGER},
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=VARCHAR},
       </if>
-      <if test="performance != null">
-        #{performance,jdbcType=INTEGER},
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
       </if>
-      <if test="maxThreads != null">
-        #{maxThreads,jdbcType=INTEGER},
+      <if test="functionalCase != null">
+        #{functionalCase,jdbcType=INTEGER},
       </if>
-      <if test="duration != null">
-        #{duration,jdbcType=INTEGER},
+      <if test="loadTestVumTotal != null">
+        #{loadTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="loadTestVumUsed != null">
+        #{loadTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="loadTestMaxThreads != null">
+        #{loadTestMaxThreads,jdbcType=INTEGER},
+      </if>
+      <if test="loadTestDuration != null">
+        #{loadTestDuration,jdbcType=INTEGER},
       </if>
       <if test="resourcePool != null">
         #{resourcePool,jdbcType=VARCHAR},
       </if>
-      <if test="organizationId != null">
-        #{organizationId,jdbcType=VARCHAR},
-      </if>
       <if test="useDefault != null">
         #{useDefault,jdbcType=BIT},
       </if>
@@ -201,14 +229,20 @@
       <if test="project != null">
         #{project,jdbcType=INTEGER},
       </if>
-      <if test="projectId != null">
-        #{projectId,jdbcType=VARCHAR},
+      <if test="apiTestVumTotal != null">
+        #{apiTestVumTotal,jdbcType=DECIMAL},
       </if>
-      <if test="vumTotal != null">
-        #{vumTotal,jdbcType=DECIMAL},
+      <if test="apiTestVumUsed != null">
+        #{apiTestVumUsed,jdbcType=DECIMAL},
       </if>
-      <if test="vumUsed != null">
-        #{vumUsed,jdbcType=DECIMAL},
+      <if test="uiTestVumTotal != null">
+        #{uiTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="uiTestVumUsed != null">
+        #{uiTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="fileStorage != null">
+        #{fileStorage,jdbcType=BIGINT},
       </if>
     </trim>
   </insert>
@@ -224,24 +258,30 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.api != null">
-        api = #{record.api,jdbcType=INTEGER},
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=VARCHAR},
       </if>
-      <if test="record.performance != null">
-        performance = #{record.performance,jdbcType=INTEGER},
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
       </if>
-      <if test="record.maxThreads != null">
-        max_threads = #{record.maxThreads,jdbcType=INTEGER},
+      <if test="record.functionalCase != null">
+        functional_case = #{record.functionalCase,jdbcType=INTEGER},
       </if>
-      <if test="record.duration != null">
-        duration = #{record.duration,jdbcType=INTEGER},
+      <if test="record.loadTestVumTotal != null">
+        load_test_vum_total = #{record.loadTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="record.loadTestVumUsed != null">
+        load_test_vum_used = #{record.loadTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.loadTestMaxThreads != null">
+        load_test_max_threads = #{record.loadTestMaxThreads,jdbcType=INTEGER},
+      </if>
+      <if test="record.loadTestDuration != null">
+        load_test_duration = #{record.loadTestDuration,jdbcType=INTEGER},
       </if>
       <if test="record.resourcePool != null">
         resource_pool = #{record.resourcePool,jdbcType=VARCHAR},
       </if>
-      <if test="record.organizationId != null">
-        organization_id = #{record.organizationId,jdbcType=VARCHAR},
-      </if>
       <if test="record.useDefault != null">
         use_default = #{record.useDefault,jdbcType=BIT},
       </if>
@@ -254,14 +294,20 @@
       <if test="record.project != null">
         project = #{record.project,jdbcType=INTEGER},
       </if>
-      <if test="record.projectId != null">
-        project_id = #{record.projectId,jdbcType=VARCHAR},
+      <if test="record.apiTestVumTotal != null">
+        api_test_vum_total = #{record.apiTestVumTotal,jdbcType=DECIMAL},
       </if>
-      <if test="record.vumTotal != null">
-        vum_total = #{record.vumTotal,jdbcType=DECIMAL},
+      <if test="record.apiTestVumUsed != null">
+        api_test_vum_used = #{record.apiTestVumUsed,jdbcType=DECIMAL},
       </if>
-      <if test="record.vumUsed != null">
-        vum_used = #{record.vumUsed,jdbcType=DECIMAL},
+      <if test="record.uiTestVumTotal != null">
+        ui_test_vum_total = #{record.uiTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="record.uiTestVumUsed != null">
+        ui_test_vum_used = #{record.uiTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fileStorage != null">
+        file_storage = #{record.fileStorage,jdbcType=BIGINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -271,19 +317,23 @@
   <update id="updateByExample" parameterType="map">
     update quota
     set id = #{record.id,jdbcType=VARCHAR},
-      api = #{record.api,jdbcType=INTEGER},
-      performance = #{record.performance,jdbcType=INTEGER},
-      max_threads = #{record.maxThreads,jdbcType=INTEGER},
-      duration = #{record.duration,jdbcType=INTEGER},
-      resource_pool = #{record.resourcePool,jdbcType=VARCHAR},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      functional_case = #{record.functionalCase,jdbcType=INTEGER},
+      load_test_vum_total = #{record.loadTestVumTotal,jdbcType=DECIMAL},
+      load_test_vum_used = #{record.loadTestVumUsed,jdbcType=DECIMAL},
+      load_test_max_threads = #{record.loadTestMaxThreads,jdbcType=INTEGER},
+      load_test_duration = #{record.loadTestDuration,jdbcType=INTEGER},
+      resource_pool = #{record.resourcePool,jdbcType=VARCHAR},
       use_default = #{record.useDefault,jdbcType=BIT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       `member` = #{record.member,jdbcType=INTEGER},
       project = #{record.project,jdbcType=INTEGER},
-      project_id = #{record.projectId,jdbcType=VARCHAR},
-      vum_total = #{record.vumTotal,jdbcType=DECIMAL},
-      vum_used = #{record.vumUsed,jdbcType=DECIMAL}
+      api_test_vum_total = #{record.apiTestVumTotal,jdbcType=DECIMAL},
+      api_test_vum_used = #{record.apiTestVumUsed,jdbcType=DECIMAL},
+      ui_test_vum_total = #{record.uiTestVumTotal,jdbcType=DECIMAL},
+      ui_test_vum_used = #{record.uiTestVumUsed,jdbcType=DECIMAL},
+      file_storage = #{record.fileStorage,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -291,24 +341,30 @@
   <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.system.domain.Quota">
     update quota
     <set>
-      <if test="api != null">
-        api = #{api,jdbcType=INTEGER},
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=VARCHAR},
       </if>
-      <if test="performance != null">
-        performance = #{performance,jdbcType=INTEGER},
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
       </if>
-      <if test="maxThreads != null">
-        max_threads = #{maxThreads,jdbcType=INTEGER},
+      <if test="functionalCase != null">
+        functional_case = #{functionalCase,jdbcType=INTEGER},
       </if>
-      <if test="duration != null">
-        duration = #{duration,jdbcType=INTEGER},
+      <if test="loadTestVumTotal != null">
+        load_test_vum_total = #{loadTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="loadTestVumUsed != null">
+        load_test_vum_used = #{loadTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="loadTestMaxThreads != null">
+        load_test_max_threads = #{loadTestMaxThreads,jdbcType=INTEGER},
+      </if>
+      <if test="loadTestDuration != null">
+        load_test_duration = #{loadTestDuration,jdbcType=INTEGER},
       </if>
       <if test="resourcePool != null">
         resource_pool = #{resourcePool,jdbcType=VARCHAR},
       </if>
-      <if test="organizationId != null">
-        organization_id = #{organizationId,jdbcType=VARCHAR},
-      </if>
       <if test="useDefault != null">
         use_default = #{useDefault,jdbcType=BIT},
       </if>
@@ -321,33 +377,43 @@
       <if test="project != null">
         project = #{project,jdbcType=INTEGER},
       </if>
-      <if test="projectId != null">
-        project_id = #{projectId,jdbcType=VARCHAR},
+      <if test="apiTestVumTotal != null">
+        api_test_vum_total = #{apiTestVumTotal,jdbcType=DECIMAL},
       </if>
-      <if test="vumTotal != null">
-        vum_total = #{vumTotal,jdbcType=DECIMAL},
+      <if test="apiTestVumUsed != null">
+        api_test_vum_used = #{apiTestVumUsed,jdbcType=DECIMAL},
       </if>
-      <if test="vumUsed != null">
-        vum_used = #{vumUsed,jdbcType=DECIMAL},
+      <if test="uiTestVumTotal != null">
+        ui_test_vum_total = #{uiTestVumTotal,jdbcType=DECIMAL},
+      </if>
+      <if test="uiTestVumUsed != null">
+        ui_test_vum_used = #{uiTestVumUsed,jdbcType=DECIMAL},
+      </if>
+      <if test="fileStorage != null">
+        file_storage = #{fileStorage,jdbcType=BIGINT},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.system.domain.Quota">
     update quota
-    set api = #{api,jdbcType=INTEGER},
-      performance = #{performance,jdbcType=INTEGER},
-      max_threads = #{maxThreads,jdbcType=INTEGER},
-      duration = #{duration,jdbcType=INTEGER},
+    set organization_id = #{organizationId,jdbcType=VARCHAR},
+      project_id = #{projectId,jdbcType=VARCHAR},
+      functional_case = #{functionalCase,jdbcType=INTEGER},
+      load_test_vum_total = #{loadTestVumTotal,jdbcType=DECIMAL},
+      load_test_vum_used = #{loadTestVumUsed,jdbcType=DECIMAL},
+      load_test_max_threads = #{loadTestMaxThreads,jdbcType=INTEGER},
+      load_test_duration = #{loadTestDuration,jdbcType=INTEGER},
       resource_pool = #{resourcePool,jdbcType=VARCHAR},
-      organization_id = #{organizationId,jdbcType=VARCHAR},
       use_default = #{useDefault,jdbcType=BIT},
       update_time = #{updateTime,jdbcType=BIGINT},
       `member` = #{member,jdbcType=INTEGER},
       project = #{project,jdbcType=INTEGER},
-      project_id = #{projectId,jdbcType=VARCHAR},
-      vum_total = #{vumTotal,jdbcType=DECIMAL},
-      vum_used = #{vumUsed,jdbcType=DECIMAL}
+      api_test_vum_total = #{apiTestVumTotal,jdbcType=DECIMAL},
+      api_test_vum_used = #{apiTestVumUsed,jdbcType=DECIMAL},
+      ui_test_vum_total = #{uiTestVumTotal,jdbcType=DECIMAL},
+      ui_test_vum_used = #{uiTestVumUsed,jdbcType=DECIMAL},
+      file_storage = #{fileStorage,jdbcType=BIGINT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/system/mapper/TestResourcePoolMapper.xml

@@ -6,15 +6,18 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="enable" jdbcType="BIT" property="enable" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="image" jdbcType="VARCHAR" property="image" />
-    <result column="heap" jdbcType="VARCHAR" property="heap" />
-    <result column="gc_algo" jdbcType="VARCHAR" property="gcAlgo" />
+    <result column="load_test_image" jdbcType="VARCHAR" property="loadTestImage" />
+    <result column="load_test_heap" jdbcType="VARCHAR" property="loadTestHeap" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
-    <result column="api" jdbcType="BIT" property="api" />
-    <result column="performance" jdbcType="BIT" property="performance" />
+    <result column="api_test" jdbcType="BIT" property="apiTest" />
+    <result column="load_test" jdbcType="BIT" property="loadTest" />
+    <result column="ui_test" jdbcType="BIT" property="uiTest" />
+    <result column="grid" jdbcType="VARCHAR" property="grid" />
+    <result column="server_url" jdbcType="VARCHAR" property="serverUrl" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,8 +78,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, `type`, description, `status`, create_time, update_time, image, `heap`, 
-    gc_algo, create_user, api, performance
+    id, `name`, `type`, description, `enable`, create_time, update_time, load_test_image, 
+    load_test_heap, create_user, api_test, load_test, ui_test, grid, server_url, deleted
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.TestResourcePoolExample" resultMap="BaseResultMap">
     select
@@ -110,15 +113,17 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.TestResourcePool">
     insert into test_resource_pool (id, `name`, `type`, 
-      description, `status`, create_time, 
-      update_time, image, `heap`, 
-      gc_algo, create_user, api, 
-      performance)
+      description, `enable`, create_time, 
+      update_time, load_test_image, load_test_heap, 
+      create_user, api_test, load_test, 
+      ui_test, grid, server_url, 
+      deleted)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=BIGINT}, #{image,jdbcType=VARCHAR}, #{heap,jdbcType=VARCHAR}, 
-      #{gcAlgo,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{api,jdbcType=BIT}, 
-      #{performance,jdbcType=BIT})
+      #{description,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=BIGINT}, #{loadTestImage,jdbcType=VARCHAR}, #{loadTestHeap,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{apiTest,jdbcType=BIT}, #{loadTest,jdbcType=BIT}, 
+      #{uiTest,jdbcType=BIT}, #{grid,jdbcType=VARCHAR}, #{serverUrl,jdbcType=VARCHAR}, 
+      #{deleted,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.system.domain.TestResourcePool">
     insert into test_resource_pool
@@ -135,8 +140,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="status != null">
-        `status`,
+      <if test="enable != null">
+        `enable`,
       </if>
       <if test="createTime != null">
         create_time,
@@ -144,23 +149,32 @@
       <if test="updateTime != null">
         update_time,
       </if>
-      <if test="image != null">
-        image,
+      <if test="loadTestImage != null">
+        load_test_image,
       </if>
-      <if test="heap != null">
-        `heap`,
-      </if>
-      <if test="gcAlgo != null">
-        gc_algo,
+      <if test="loadTestHeap != null">
+        load_test_heap,
       </if>
       <if test="createUser != null">
         create_user,
       </if>
-      <if test="api != null">
-        api,
+      <if test="apiTest != null">
+        api_test,
       </if>
-      <if test="performance != null">
-        performance,
+      <if test="loadTest != null">
+        load_test,
+      </if>
+      <if test="uiTest != null">
+        ui_test,
+      </if>
+      <if test="grid != null">
+        grid,
+      </if>
+      <if test="serverUrl != null">
+        server_url,
+      </if>
+      <if test="deleted != null">
+        deleted,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -176,8 +190,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -185,23 +199,32 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="image != null">
-        #{image,jdbcType=VARCHAR},
+      <if test="loadTestImage != null">
+        #{loadTestImage,jdbcType=VARCHAR},
       </if>
-      <if test="heap != null">
-        #{heap,jdbcType=VARCHAR},
-      </if>
-      <if test="gcAlgo != null">
-        #{gcAlgo,jdbcType=VARCHAR},
+      <if test="loadTestHeap != null">
+        #{loadTestHeap,jdbcType=VARCHAR},
       </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="api != null">
-        #{api,jdbcType=BIT},
+      <if test="apiTest != null">
+        #{apiTest,jdbcType=BIT},
       </if>
-      <if test="performance != null">
-        #{performance,jdbcType=BIT},
+      <if test="loadTest != null">
+        #{loadTest,jdbcType=BIT},
+      </if>
+      <if test="uiTest != null">
+        #{uiTest,jdbcType=BIT},
+      </if>
+      <if test="grid != null">
+        #{grid,jdbcType=VARCHAR},
+      </if>
+      <if test="serverUrl != null">
+        #{serverUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=BIT},
       </if>
     </trim>
   </insert>
@@ -226,8 +249,8 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.status != null">
-        `status` = #{record.status,jdbcType=VARCHAR},
+      <if test="record.enable != null">
+        `enable` = #{record.enable,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -235,23 +258,32 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=BIGINT},
       </if>
-      <if test="record.image != null">
-        image = #{record.image,jdbcType=VARCHAR},
+      <if test="record.loadTestImage != null">
+        load_test_image = #{record.loadTestImage,jdbcType=VARCHAR},
       </if>
-      <if test="record.heap != null">
-        `heap` = #{record.heap,jdbcType=VARCHAR},
-      </if>
-      <if test="record.gcAlgo != null">
-        gc_algo = #{record.gcAlgo,jdbcType=VARCHAR},
+      <if test="record.loadTestHeap != null">
+        load_test_heap = #{record.loadTestHeap,jdbcType=VARCHAR},
       </if>
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
-      <if test="record.api != null">
-        api = #{record.api,jdbcType=BIT},
+      <if test="record.apiTest != null">
+        api_test = #{record.apiTest,jdbcType=BIT},
       </if>
-      <if test="record.performance != null">
-        performance = #{record.performance,jdbcType=BIT},
+      <if test="record.loadTest != null">
+        load_test = #{record.loadTest,jdbcType=BIT},
+      </if>
+      <if test="record.uiTest != null">
+        ui_test = #{record.uiTest,jdbcType=BIT},
+      </if>
+      <if test="record.grid != null">
+        grid = #{record.grid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serverUrl != null">
+        server_url = #{record.serverUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleted != null">
+        deleted = #{record.deleted,jdbcType=BIT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -264,15 +296,18 @@
       `name` = #{record.name,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
+      `enable` = #{record.enable,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      image = #{record.image,jdbcType=VARCHAR},
-      `heap` = #{record.heap,jdbcType=VARCHAR},
-      gc_algo = #{record.gcAlgo,jdbcType=VARCHAR},
+      load_test_image = #{record.loadTestImage,jdbcType=VARCHAR},
+      load_test_heap = #{record.loadTestHeap,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
-      api = #{record.api,jdbcType=BIT},
-      performance = #{record.performance,jdbcType=BIT}
+      api_test = #{record.apiTest,jdbcType=BIT},
+      load_test = #{record.loadTest,jdbcType=BIT},
+      ui_test = #{record.uiTest,jdbcType=BIT},
+      grid = #{record.grid,jdbcType=VARCHAR},
+      server_url = #{record.serverUrl,jdbcType=VARCHAR},
+      deleted = #{record.deleted,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -289,8 +324,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        `enable` = #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -298,23 +333,32 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=BIGINT},
       </if>
-      <if test="image != null">
-        image = #{image,jdbcType=VARCHAR},
+      <if test="loadTestImage != null">
+        load_test_image = #{loadTestImage,jdbcType=VARCHAR},
       </if>
-      <if test="heap != null">
-        `heap` = #{heap,jdbcType=VARCHAR},
-      </if>
-      <if test="gcAlgo != null">
-        gc_algo = #{gcAlgo,jdbcType=VARCHAR},
+      <if test="loadTestHeap != null">
+        load_test_heap = #{loadTestHeap,jdbcType=VARCHAR},
       </if>
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
-      <if test="api != null">
-        api = #{api,jdbcType=BIT},
+      <if test="apiTest != null">
+        api_test = #{apiTest,jdbcType=BIT},
       </if>
-      <if test="performance != null">
-        performance = #{performance,jdbcType=BIT},
+      <if test="loadTest != null">
+        load_test = #{loadTest,jdbcType=BIT},
+      </if>
+      <if test="uiTest != null">
+        ui_test = #{uiTest,jdbcType=BIT},
+      </if>
+      <if test="grid != null">
+        grid = #{grid,jdbcType=VARCHAR},
+      </if>
+      <if test="serverUrl != null">
+        server_url = #{serverUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        deleted = #{deleted,jdbcType=BIT},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -324,15 +368,18 @@
     set `name` = #{name,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
+      `enable` = #{enable,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-      image = #{image,jdbcType=VARCHAR},
-      `heap` = #{heap,jdbcType=VARCHAR},
-      gc_algo = #{gcAlgo,jdbcType=VARCHAR},
+      load_test_image = #{loadTestImage,jdbcType=VARCHAR},
+      load_test_heap = #{loadTestHeap,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
-      api = #{api,jdbcType=BIT},
-      performance = #{performance,jdbcType=BIT}
+      api_test = #{apiTest,jdbcType=BIT},
+      load_test = #{loadTest,jdbcType=BIT},
+      ui_test = #{uiTest,jdbcType=BIT},
+      grid = #{grid,jdbcType=VARCHAR},
+      server_url = #{serverUrl,jdbcType=VARCHAR},
+      deleted = #{deleted,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserMapper.xml

@@ -6,7 +6,7 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="enable" jdbcType="BIT" property="enable" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="language" jdbcType="VARCHAR" property="language" />
@@ -15,6 +15,7 @@
     <result column="source" jdbcType="VARCHAR" property="source" />
     <result column="last_project_id" jdbcType="VARCHAR" property="lastProjectId" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+    <result column="update_user" jdbcType="VARCHAR" property="updateUser" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,8 +76,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, email, `password`, `status`, create_time, update_time, `language`, last_organization_id, 
-    phone, `source`, last_project_id, create_user
+    id, `name`, email, `password`, `enable`, create_time, update_time, `language`, last_organization_id, 
+    phone, `source`, last_project_id, create_user, update_user
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.UserExample" resultMap="BaseResultMap">
     select
@@ -110,15 +111,15 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.User">
     insert into user (id, `name`, email, 
-      `password`, `status`, create_time, 
+      `password`, `enable`, create_time, 
       update_time, `language`, last_organization_id, 
       phone, `source`, last_project_id, 
-      create_user)
+      create_user, update_user)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
-      #{password,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{password,jdbcType=VARCHAR}, #{enable,jdbcType=BIT}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT}, #{language,jdbcType=VARCHAR}, #{lastOrganizationId,jdbcType=VARCHAR}, 
       #{phone,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, #{lastProjectId,jdbcType=VARCHAR}, 
-      #{createUser,jdbcType=VARCHAR})
+      #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.system.domain.User">
     insert into user
@@ -135,8 +136,8 @@
       <if test="password != null">
         `password`,
       </if>
-      <if test="status != null">
-        `status`,
+      <if test="enable != null">
+        `enable`,
       </if>
       <if test="createTime != null">
         create_time,
@@ -162,6 +163,9 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -176,8 +180,8 @@
       <if test="password != null">
         #{password,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=BIGINT},
@@ -203,6 +207,9 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.system.domain.UserExample" resultType="java.lang.Long">
@@ -226,8 +233,8 @@
       <if test="record.password != null">
         `password` = #{record.password,jdbcType=VARCHAR},
       </if>
-      <if test="record.status != null">
-        `status` = #{record.status,jdbcType=VARCHAR},
+      <if test="record.enable != null">
+        `enable` = #{record.enable,jdbcType=BIT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=BIGINT},
@@ -253,6 +260,9 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
+      <if test="record.updateUser != null">
+        update_user = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +274,7 @@
       `name` = #{record.name,jdbcType=VARCHAR},
       email = #{record.email,jdbcType=VARCHAR},
       `password` = #{record.password,jdbcType=VARCHAR},
-      `status` = #{record.status,jdbcType=VARCHAR},
+      `enable` = #{record.enable,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       `language` = #{record.language,jdbcType=VARCHAR},
@@ -272,7 +282,8 @@
       phone = #{record.phone,jdbcType=VARCHAR},
       `source` = #{record.source,jdbcType=VARCHAR},
       last_project_id = #{record.lastProjectId,jdbcType=VARCHAR},
-      create_user = #{record.createUser,jdbcType=VARCHAR}
+      create_user = #{record.createUser,jdbcType=VARCHAR},
+      update_user = #{record.updateUser,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -289,8 +300,8 @@
       <if test="password != null">
         `password` = #{password,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=VARCHAR},
+      <if test="enable != null">
+        `enable` = #{enable,jdbcType=BIT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=BIGINT},
@@ -316,6 +327,9 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -324,7 +338,7 @@
     set `name` = #{name,jdbcType=VARCHAR},
       email = #{email,jdbcType=VARCHAR},
       `password` = #{password,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=VARCHAR},
+      `enable` = #{enable,jdbcType=BIT},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       `language` = #{language,jdbcType=VARCHAR},
@@ -332,7 +346,8 @@
       phone = #{phone,jdbcType=VARCHAR},
       `source` = #{source,jdbcType=VARCHAR},
       last_project_id = #{lastProjectId,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=VARCHAR}
+      create_user = #{createUser,jdbcType=VARCHAR},
+      update_user = #{updateUser,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/system/mapper/UserRoleMapper.xml

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="system" jdbcType="BIT" property="system" />
+    <result column="internal" jdbcType="BIT" property="internal" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
@@ -71,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, description, `system`, `type`, create_time, update_time, create_user, 
+    id, `name`, description, internal, `type`, create_time, update_time, create_user, 
     scope_id
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.UserRoleExample" resultMap="BaseResultMap">
@@ -106,11 +106,11 @@
   </delete>
   <insert id="insert" parameterType="io.metersphere.system.domain.UserRole">
     insert into user_role (id, `name`, description, 
-      `system`, `type`, create_time, 
+      internal, `type`, create_time, 
       update_time, create_user, scope_id
       )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{system,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
+      #{internal,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR}, #{scopeId,jdbcType=VARCHAR}
       )
   </insert>
@@ -126,8 +126,8 @@
       <if test="description != null">
         description,
       </if>
-      <if test="system != null">
-        `system`,
+      <if test="internal != null">
+        internal,
       </if>
       <if test="type != null">
         `type`,
@@ -155,8 +155,8 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        #{system,jdbcType=BIT},
+      <if test="internal != null">
+        #{internal,jdbcType=BIT},
       </if>
       <if test="type != null">
         #{type,jdbcType=VARCHAR},
@@ -193,8 +193,8 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.system != null">
-        `system` = #{record.system,jdbcType=BIT},
+      <if test="record.internal != null">
+        internal = #{record.internal,jdbcType=BIT},
       </if>
       <if test="record.type != null">
         `type` = #{record.type,jdbcType=VARCHAR},
@@ -221,7 +221,7 @@
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      `system` = #{record.system,jdbcType=BIT},
+      internal = #{record.internal,jdbcType=BIT},
       `type` = #{record.type,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
@@ -240,8 +240,8 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="system != null">
-        `system` = #{system,jdbcType=BIT},
+      <if test="internal != null">
+        internal = #{internal,jdbcType=BIT},
       </if>
       <if test="type != null">
         `type` = #{type,jdbcType=VARCHAR},
@@ -265,7 +265,7 @@
     update user_role
     set `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      `system` = #{system,jdbcType=BIT},
+      internal = #{internal,jdbcType=BIT},
       `type` = #{type,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},

backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_ddl.sql

@@ -1,97 +1,88 @@
 -- set innodb lock wait timeout
 SET SESSION innodb_lock_wait_timeout = 7200;
 
---
--- Table structure for table `auth_source`
---
-
-CREATE TABLE IF NOT EXISTS `auth_source`
+DROP TABLE IF EXISTS auth_source;
+CREATE TABLE auth_source
 (
     `id`            VARCHAR(50) NOT NULL COMMENT '认证源ID',
     `configuration` BLOB        NOT NULL COMMENT '认证源配置',
-    `status`        VARCHAR(64) NOT NULL COMMENT '状态 启用 禁用',
+    `enable`        BIT         NOT NULL DEFAULT 1 COMMENT '是否启用',
     `create_time`   BIGINT      NOT NULL COMMENT '创建时间',
     `update_time`   BIGINT      NOT NULL COMMENT '更新时间',
-    `description`   VARCHAR(500) DEFAULT NULL COMMENT '描述',
-    `name`          VARCHAR(255) DEFAULT NULL COMMENT '名称',
-    `type`          VARCHAR(30)  DEFAULT NULL COMMENT '类型',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`)
+    `description`   VARCHAR(500) COMMENT '描述',
+    `name`          VARCHAR(255) COMMENT '名称',
+    `type`          VARCHAR(30) COMMENT '类型',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='三方认证源';
+  COLLATE = utf8mb4_general_ci COMMENT = '三方认证源';
 
---
--- Table structure for table `user_role`
---
 
-CREATE TABLE IF NOT EXISTS `user_role`
+CREATE INDEX idx_name ON auth_source (`name`);
+CREATE INDEX idx_create_time ON auth_source (`create_time`);
+CREATE INDEX idx_update_time ON auth_source (`update_time`);
+
+DROP TABLE IF EXISTS user_role;
+CREATE TABLE user_role
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT '组ID',
     `name`        VARCHAR(255) NOT NULL COMMENT '组名称',
-    `description` VARCHAR(500) DEFAULT NULL COMMENT '描述',
-    `system`      BIT(1)       NOT NULL COMMENT '是否是系统用户组',
-    `type`        VARCHAR(20)  NOT NULL COMMENT '所属类型',
+    `description` VARCHAR(500) COMMENT '描述',
+    `internal`    BIT          NOT NULL COMMENT '是否是内置用户组',
+    `type`        VARCHAR(20)  NOT NULL COMMENT '所属类型 SYSTEM ORGANIZATION PROJECT',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `update_time` BIGINT       NOT NULL COMMENT '更新时间',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人(操作人）',
     `scope_id`    VARCHAR(50)  NOT NULL COMMENT '应用范围',
-    PRIMARY KEY (`id`),
-    KEY `idx_group_name` (`name`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_scope_id` (`scope_id`),
-    KEY `idx_update_time` (`update_time`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户组';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户组';
 
---
--- Table structure for table `license`
---
 
-CREATE TABLE IF NOT EXISTS `license`
+CREATE INDEX idx_group_name ON user_role (`name`);
+CREATE INDEX idx_create_time ON user_role (`create_time`);
+CREATE INDEX idx_create_user ON user_role (`create_user`);
+CREATE INDEX idx_scope_id ON user_role (`scope_id`);
+CREATE INDEX idx_update_time ON user_role (`update_time`);
+
+DROP TABLE IF EXISTS license;
+CREATE TABLE license
 (
     `id`           VARCHAR(50) NOT NULL COMMENT 'ID',
     `create_time`  BIGINT      NOT NULL COMMENT 'Create timestamp',
     `update_time`  BIGINT      NOT NULL COMMENT 'Update timestamp',
     `license_code` LONGTEXT COMMENT 'license_code',
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci;
+  COLLATE = utf8mb4_general_ci COMMENT = '';
 
---
--- Table structure for table `message_task`
---
-
-CREATE TABLE IF NOT EXISTS `message_task`
+DROP TABLE IF EXISTS message_task;
+CREATE TABLE message_task
 (
-    `id`          VARCHAR(50)  NOT NULL,
+    `id`          VARCHAR(50)  NOT NULL COMMENT '',
     `type`        VARCHAR(50)  NOT NULL COMMENT '消息类型',
     `event`       VARCHAR(255) NOT NULL COMMENT '通知事件类型',
     `receiver`    VARCHAR(50)  NOT NULL COMMENT '接收人id',
     `task_type`   VARCHAR(64)  NOT NULL COMMENT '任务类型',
-    `webhook`     VARCHAR(255)          DEFAULT NULL COMMENT 'webhook地址',
+    `webhook`     VARCHAR(255) COMMENT 'webhook地址',
     `test_id`     VARCHAR(50)  NOT NULL DEFAULT 'none' COMMENT '具体测试的ID',
-    `create_time` BIGINT       NOT NULL DEFAULT '0' COMMENT '创建时间',
+    `create_time` BIGINT       NOT NULL DEFAULT 0 COMMENT '创建时间',
     `project_id`  VARCHAR(50)  NOT NULL COMMENT '项目ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_project_id` (`project_id`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_receiver` (`receiver`),
-    KEY `idx_test_id` (`test_id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='消息通知任务';
+  COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务';
 
---
--- Table structure for table `notification`
---
 
-CREATE TABLE IF NOT EXISTS `notification`
+CREATE INDEX idx_project_id ON message_task (`project_id`);
+CREATE INDEX idx_create_time ON message_task (`create_time`);
+CREATE INDEX idx_receiver ON message_task (`receiver`);
+CREATE INDEX idx_test_id ON message_task (`test_id`);
+
+DROP TABLE IF EXISTS notification;
+CREATE TABLE notification
 (
     `id`            BIGINT       NOT NULL AUTO_INCREMENT COMMENT 'ID',
     `type`          VARCHAR(30)  NOT NULL COMMENT '通知类型',
@@ -104,194 +95,183 @@ CREATE TABLE IF NOT EXISTS `notification`
     `resource_id`   VARCHAR(50)  NOT NULL COMMENT '资源ID',
     `resource_type` VARCHAR(50)  NOT NULL COMMENT '资源类型',
     `resource_name` VARCHAR(255) NOT NULL COMMENT '资源名称',
-    PRIMARY KEY (`id`),
-    KEY `idx_receiver` (`receiver`),
-    KEY `idx_receiver_type` (`receiver`, `type`),
-    KEY `idx_notification_create_time` (`create_time`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='消息通知';
+  COLLATE = utf8mb4_general_ci COMMENT = '消息通知';
 
---
--- Table structure for table `novice_statistics`
---
 
-CREATE TABLE IF NOT EXISTS `novice_statistics`
+CREATE INDEX idx_receiver ON notification (`receiver`);
+CREATE INDEX idx_receiver_type ON notification (`receiver`, `type`);
+CREATE INDEX idx_notification_create_time ON notification (`create_time`);
+
+DROP TABLE IF EXISTS novice_statistics;
+CREATE TABLE novice_statistics
 (
-    `id`          VARCHAR(50) NOT NULL,
-    `user_id`     VARCHAR(50)          DEFAULT NULL COMMENT '用户id',
-    `guide_step`  BIT(1)      NOT NULL DEFAULT b'0' COMMENT '新手引导完成的步骤',
-    `guide_num`   INT         NOT NULL DEFAULT '1' COMMENT '新手引导的次数',
+    `id`          VARCHAR(50) NOT NULL COMMENT '',
+    `user_id`     VARCHAR(50) COMMENT '用户id',
+    `guide_step`  BIT         NOT NULL DEFAULT 0 COMMENT '新手引导完成的步骤',
+    `guide_num`   INT         NOT NULL DEFAULT 1 COMMENT '新手引导的次数',
     `data_option` LONGBLOB COMMENT 'data option (JSON format)',
-    `create_time` BIGINT               DEFAULT NULL,
-    `update_time` BIGINT               DEFAULT NULL,
-    PRIMARY KEY (`id`)
+    `create_time` BIGINT COMMENT '',
+    `update_time` BIGINT COMMENT '',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='新手村';
+  COLLATE = utf8mb4_general_ci COMMENT = '新手村';
 
---
--- Table structure for table `operating_log`
---
-
-CREATE TABLE IF NOT EXISTS `operating_log`
+DROP TABLE IF EXISTS operating_log;
+CREATE TABLE operating_log
 (
     `id`           VARCHAR(50) NOT NULL COMMENT 'ID',
     `project_id`   VARCHAR(50) NOT NULL COMMENT '项目ID',
-    `oper_method`  VARCHAR(500)  DEFAULT NULL COMMENT 'operating method',
-    `create_user`  VARCHAR(100)  DEFAULT NULL COMMENT '创建人',
-    `oper_user`    VARCHAR(50)   DEFAULT NULL COMMENT '操作人',
-    `source_id`    VARCHAR(6000) DEFAULT NULL COMMENT '资源ID',
-    `oper_type`    VARCHAR(100)  DEFAULT NULL COMMENT '操作类型',
-    `oper_module`  VARCHAR(100)  DEFAULT NULL COMMENT '操作模块',
-    `oper_title`   VARCHAR(6000) DEFAULT NULL COMMENT '操作标题',
-    `oper_path`    VARCHAR(500)  DEFAULT NULL COMMENT '操作路径',
+    `oper_method`  VARCHAR(500) COMMENT 'operating method',
+    `create_user`  VARCHAR(100) COMMENT '创建人',
+    `oper_user`    VARCHAR(50) COMMENT '操作人',
+    `source_id`    VARCHAR(6000) COMMENT '资源ID',
+    `oper_type`    VARCHAR(100) COMMENT '操作类型',
+    `oper_module`  VARCHAR(100) COMMENT '操作模块',
+    `oper_title`   VARCHAR(6000) COMMENT '操作标题',
+    `oper_path`    VARCHAR(500) COMMENT '操作路径',
     `oper_content` LONGBLOB COMMENT '操作内容',
     `oper_params`  LONGBLOB COMMENT '操作参数',
     `oper_time`    BIGINT      NOT NULL COMMENT '操作时间',
-    PRIMARY KEY (`id`),
-    KEY `idx_oper_module` (`oper_module`),
-    KEY `idx_oper_project_id` (`project_id`),
-    KEY `idx_oper_time_index` (`oper_time`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='操作日志';
+  COLLATE = utf8mb4_general_ci COMMENT = '操作日志';
 
---
--- Table structure for table `operating_log_resource`
---
 
-CREATE TABLE IF NOT EXISTS `operating_log_resource`
+CREATE INDEX idx_oper_module ON operating_log (`oper_module`);
+CREATE INDEX idx_oper_project_id ON operating_log (`project_id`);
+CREATE INDEX idx_oper_time_index ON operating_log (`oper_time`);
+
+DROP TABLE IF EXISTS operating_log_resource;
+CREATE TABLE operating_log_resource
 (
     `id`               VARCHAR(50) NOT NULL COMMENT 'ID',
     `operating_log_id` VARCHAR(50) NOT NULL COMMENT 'Operating log ID',
     `source_id`        VARCHAR(50) NOT NULL COMMENT 'operating source id',
-    PRIMARY KEY (`id`),
-    KEY `operating_log_id_index` (`operating_log_id`),
-    KEY `source_id_index` (`source_id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='操作日志关系记录';
+  COLLATE = utf8mb4_general_ci COMMENT = '操作日志关系记录';
 
---
--- Table structure for table `plugin`
---
 
-CREATE TABLE IF NOT EXISTS `plugin`
+CREATE INDEX operating_log_id_index ON operating_log_resource (`operating_log_id`);
+CREATE INDEX source_id_index ON operating_log_resource (`source_id`);
+
+DROP TABLE IF EXISTS plugin;
+CREATE TABLE plugin
 (
     `id`           VARCHAR(50)  NOT NULL COMMENT 'ID',
-    `name`         VARCHAR(255) DEFAULT NULL COMMENT 'plugin name',
+    `name`         VARCHAR(255) COMMENT 'plugin name',
     `plugin_id`    VARCHAR(300) NOT NULL COMMENT 'Plugin id',
     `script_id`    VARCHAR(300) NOT NULL COMMENT 'Ui script id',
     `clazz_name`   VARCHAR(500) NOT NULL COMMENT 'Plugin clazzName',
     `jmeter_clazz` VARCHAR(300) NOT NULL COMMENT 'Jmeter base clazzName',
     `source_path`  VARCHAR(300) NOT NULL COMMENT 'Plugin jar path',
     `source_name`  VARCHAR(300) NOT NULL COMMENT 'Plugin jar name',
-    `exec_entry`   VARCHAR(300) DEFAULT NULL COMMENT 'plugin init entry class',
-    `create_time`  BIGINT       DEFAULT NULL,
-    `update_time`  BIGINT       DEFAULT NULL,
-    `create_user`  VARCHAR(50)  DEFAULT NULL,
-    `xpack`        BIT(1)       DEFAULT NULL COMMENT 'Is xpack plugin',
+    `exec_entry`   VARCHAR(300) COMMENT 'plugin init entry class',
+    `create_time`  BIGINT COMMENT '',
+    `update_time`  BIGINT COMMENT '',
+    `create_user`  VARCHAR(50) COMMENT '',
+    `xpack`        BIT COMMENT 'Is xpack plugin',
     `scenario`     VARCHAR(50)  NOT NULL COMMENT 'Plugin usage scenarios',
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='插件';
+  COLLATE = utf8mb4_general_ci COMMENT = '插件';
 
---
--- Table structure for table `quota`
---
-
-CREATE TABLE IF NOT EXISTS `quota`
+DROP TABLE IF EXISTS quota;
+CREATE TABLE quota
 (
-    `id`              VARCHAR(50) NOT NULL,
-    `api`             INT            DEFAULT NULL COMMENT '接口数量',
-    `performance`     INT            DEFAULT NULL COMMENT '性能测试数量',
-    `max_threads`     INT            DEFAULT NULL COMMENT '最大并发数',
-    `duration`        INT            DEFAULT NULL COMMENT '最大执行时长',
-    `resource_pool`   VARCHAR(1000)  DEFAULT NULL COMMENT '资源池列表',
-    `organization_id` VARCHAR(50)    DEFAULT NULL COMMENT '组织ID',
-    `use_default`     BIT(1)         DEFAULT NULL COMMENT '是否使用默认值',
-    `update_time`     BIGINT         DEFAULT NULL COMMENT '更新时间',
-    `member`          INT            DEFAULT NULL COMMENT '成员数量限制',
-    `project`         INT            DEFAULT NULL COMMENT '项目数量限制',
-    `project_id`      VARCHAR(50)    DEFAULT NULL COMMENT '项目类型配额',
-    `vum_total`       DECIMAL(10, 2) DEFAULT NULL COMMENT '总vum数',
-    `vum_used`        DECIMAL(10, 2) DEFAULT NULL COMMENT '消耗的vum数',
-    PRIMARY KEY (`id`),
-    KEY `idx_quota_project_id` (`project_id`),
-    KEY `idx_quota_organization_id` (`organization_id`)
+    `id`                    VARCHAR(50) NOT NULL COMMENT '',
+    `organization_id`       VARCHAR(50) COMMENT '组织ID',
+    `project_id`            VARCHAR(50) COMMENT '项目类型配额',
+    `functional_case`       INT COMMENT '功能用例数量',
+    `load_test_vum_total`   DECIMAL(10, 2) COMMENT '总vum数',
+    `load_test_vum_used`    DECIMAL(10, 2) COMMENT '消耗的vum数',
+    `load_test_max_threads` INT COMMENT '最大并发数',
+    `load_test_duration`    INT COMMENT '最大执行时长',
+    `resource_pool`         VARCHAR(1000) COMMENT '资源池列表',
+    `use_default`           BIT COMMENT '是否使用默认值',
+    `update_time`           BIGINT COMMENT '更新时间',
+    `member`                INT COMMENT '成员数量限制',
+    `project`               INT COMMENT '项目数量限制',
+    `api_test_vum_total`    DECIMAL(10, 2) COMMENT '总vum数',
+    `api_test_vum_used`     DECIMAL(10, 2) COMMENT '消耗的vum数',
+    `ui_test_vum_total`     DECIMAL(10, 2) COMMENT '总vum数',
+    `ui_test_vum_used`      DECIMAL(10, 2) COMMENT '消耗的vum数',
+    `file_storage`          BIGINT COMMENT '文件大小限制',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='配额';
+  COLLATE = utf8mb4_general_ci COMMENT = '配额';
 
---
--- Table structure for table `schedule`
---
 
-CREATE TABLE IF NOT EXISTS `schedule`
+CREATE INDEX idx_quota_project_id ON quota (`project_id`);
+CREATE INDEX idx_quota_workspace_id ON quota (`organization_id`);
+
+DROP TABLE IF EXISTS schedule;
+CREATE TABLE schedule
 (
-    `id`          VARCHAR(50)  NOT NULL,
-    `key`         VARCHAR(50)   DEFAULT NULL COMMENT 'qrtz UUID',
+    `id`          VARCHAR(50)  NOT NULL COMMENT '',
+    `key`         VARCHAR(50) COMMENT 'qrtz UUID',
     `type`        VARCHAR(50)  NOT NULL COMMENT '资源类型',
-    `value`       VARCHAR(255) NOT NULL COMMENT 'Schedule value',
+    `value`       VARCHAR(255) NOT NULL COMMENT 'cron 表达式',
     `job`         VARCHAR(64)  NOT NULL COMMENT 'Schedule Job Class Name',
-    `enable`      BIT(1)        DEFAULT NULL COMMENT 'Schedule Eable',
-    `resource_id` VARCHAR(50)   DEFAULT NULL,
+    `enable`      BIT COMMENT '是否开启',
+    `resource_id` VARCHAR(50) COMMENT '资源ID，api_scenario ui_scenario load_test',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人',
-    `create_time` BIGINT        DEFAULT NULL COMMENT 'Create timestamp',
-    `update_time` BIGINT        DEFAULT NULL COMMENT 'Update timestamp',
-    `project_id`  VARCHAR(50)   DEFAULT NULL COMMENT '项目ID',
-    `name`        VARCHAR(255)  DEFAULT NULL COMMENT '名称',
-    `config`      VARCHAR(1000) DEFAULT NULL COMMENT '配置',
-    PRIMARY KEY (`id`),
-    KEY `idx_resource_id` (`resource_id`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`),
-    KEY `idx_project_id` (`project_id`),
-    KEY `idx_enable` (`enable`),
-    KEY `idx_name` (`name`),
-    KEY `idx_type` (`type`)
+    `create_time` BIGINT       NOT NULL COMMENT '创建时间',
+    `update_time` BIGINT       NOT NULL COMMENT '更新时间',
+    `project_id`  VARCHAR(50) COMMENT '项目ID',
+    `name`        VARCHAR(100) COMMENT '名称',
+    `config`      VARCHAR(1000) COMMENT '配置',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='定时任务';
+  COLLATE = utf8mb4_general_ci COMMENT = '定时任务';
 
---
--- Table structure for table `service_integration`
---
 
-CREATE TABLE IF NOT EXISTS `service_integration`
+CREATE INDEX idx_resource_id ON schedule (`resource_id`);
+CREATE INDEX idx_create_user ON schedule (`create_user`);
+CREATE INDEX idx_create_time ON schedule (`create_time`);
+CREATE INDEX idx_update_time ON schedule (`update_time`);
+CREATE INDEX idx_project_id ON schedule (`project_id`);
+CREATE INDEX idx_enable ON schedule (`enable`);
+CREATE INDEX idx_name ON schedule (`name`);
+CREATE INDEX idx_type ON schedule (`type`);
+
+DROP TABLE IF EXISTS service_integration;
+CREATE TABLE service_integration
 (
-    `id`              VARCHAR(50) NOT NULL,
+    `id`              VARCHAR(50) NOT NULL COMMENT '',
     `platform`        VARCHAR(50) NOT NULL COMMENT '平台',
-    `configuration`   BLOB        NOT NULL,
-    `organization_id` VARCHAR(50) DEFAULT NULL COMMENT '组织ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_organization_id` (`organization_id`)
+    `configuration`   BLOB        NOT NULL COMMENT '',
+    `organization_id` VARCHAR(50) COMMENT '组织ID',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='服务集成';
+  COLLATE = utf8mb4_general_ci COMMENT = '服务集成';
 
---
--- Table structure for table `system_parameter`
---
 
-CREATE TABLE IF NOT EXISTS `system_parameter`
+CREATE INDEX idx_workspace_id ON service_integration (`organization_id`);
+
+DROP TABLE IF EXISTS system_parameter;
+CREATE TABLE system_parameter
 (
     `param_key`   VARCHAR(64)  NOT NULL COMMENT '参数名称',
-    `param_value` VARCHAR(255)          DEFAULT NULL COMMENT '参数值',
+    `param_value` VARCHAR(255) COMMENT '参数值',
     `type`        VARCHAR(100) NOT NULL DEFAULT 'text' COMMENT '类型',
-    PRIMARY KEY (`param_key`)
+    PRIMARY KEY (param_key)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='系统参数';
+  COLLATE = utf8mb4_general_ci COMMENT = '系统参数';
 
---
--- Table structure for table `test_resource`
---
-
-CREATE TABLE IF NOT EXISTS `test_resource`
+DROP TABLE IF EXISTS test_resource;
+CREATE TABLE test_resource
 (
     `id`                    VARCHAR(50) NOT NULL COMMENT '资源节点ID',
     `test_resource_pool_id` VARCHAR(50) NOT NULL COMMENT '资源池ID',
@@ -299,81 +279,83 @@ CREATE TABLE IF NOT EXISTS `test_resource`
     `status`                VARCHAR(20) NOT NULL COMMENT '资源节点状态',
     `create_time`           BIGINT      NOT NULL COMMENT '创建时间',
     `update_time`           BIGINT      NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    KEY `idx_resource_pool_id` (`test_resource_pool_id`),
-    KEY `idx_status` (`status`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='测试资源池节点';
+  COLLATE = utf8mb4_general_ci COMMENT = '测试资源池节点';
 
---
--- Table structure for table `test_resource_pool`
---
 
-CREATE TABLE IF NOT EXISTS `test_resource_pool`
+CREATE INDEX idx_resource_pool_id ON test_resource (`test_resource_pool_id`);
+CREATE INDEX idx_status ON test_resource (`status`);
+CREATE INDEX idx_create_time ON test_resource (`create_time`);
+CREATE INDEX idx_update_time ON test_resource (`update_time`);
+
+DROP TABLE IF EXISTS test_resource_pool;
+CREATE TABLE test_resource_pool
 (
-    `id`          VARCHAR(50)  NOT NULL COMMENT '资源池ID',
-    `name`        VARCHAR(255) NOT NULL COMMENT '名称',
-    `type`        VARCHAR(30)  NOT NULL COMMENT '类型',
-    `description` VARCHAR(500) DEFAULT NULL COMMENT '描述',
-    `status`      VARCHAR(20)  NOT NULL COMMENT '状态',
-    `create_time` BIGINT       NOT NULL COMMENT '创建时间',
-    `update_time` BIGINT       NOT NULL COMMENT '更新时间',
-    `image`       VARCHAR(100) DEFAULT NULL COMMENT '性能测试镜像',
-    `heap`        VARCHAR(200) DEFAULT NULL COMMENT '性能测试jvm配置',
-    `gc_algo`     VARCHAR(200) DEFAULT NULL COMMENT '性能测试gc配置',
-    `create_user` VARCHAR(50)  DEFAULT NULL COMMENT '创建人',
-    `api`         BIT(1)       DEFAULT NULL COMMENT '是否用于接口测试',
-    `performance` BIT(1)       DEFAULT NULL COMMENT '是否用于性能测试',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_type` (`type`),
-    KEY `idx_status` (`status`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`),
-    KEY `idx_create_user` (`create_user`)
+    `id`              VARCHAR(50)  NOT NULL COMMENT '资源池ID',
+    `name`            VARCHAR(255) NOT NULL COMMENT '名称',
+    `type`            VARCHAR(30)  NOT NULL COMMENT '类型',
+    `description`     VARCHAR(500) COMMENT '描述',
+    `enable`          BIT          NOT NULL DEFAULT 1 COMMENT '是否启用',
+    `create_time`     BIGINT       NOT NULL COMMENT '创建时间',
+    `update_time`     BIGINT       NOT NULL COMMENT '更新时间',
+    `load_test_image` VARCHAR(100) COMMENT '性能测试镜像',
+    `load_test_heap`  VARCHAR(200) COMMENT '性能测试jvm配置',
+    `create_user`     VARCHAR(50) COMMENT '创建人',
+    `api_test`        BIT COMMENT '是否用于接口测试',
+    `load_test`       BIT COMMENT '是否用于性能测试',
+    `ui_test`         BIT COMMENT '是否用于ui测试',
+    `grid`            VARCHAR(255) COMMENT 'ui测试grid配置',
+    `server_url`      VARCHAR(255) COMMENT 'ms部署地址',
+    `deleted`         BIT          NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='测试资源池';
+  COLLATE = utf8mb4_general_ci COMMENT = '测试资源池';
 
---
--- Table structure for table `user`
---
 
-CREATE TABLE IF NOT EXISTS `user`
+CREATE INDEX idx_name ON test_resource_pool (`name`);
+CREATE INDEX idx_type ON test_resource_pool (`type`);
+CREATE INDEX idx_status ON test_resource_pool (`enable`);
+CREATE INDEX idx_create_time ON test_resource_pool (`create_time`);
+CREATE INDEX idx_update_time ON test_resource_pool (`update_time`);
+CREATE INDEX idx_create_user ON test_resource_pool (`create_user`);
+
+DROP TABLE IF EXISTS user;
+CREATE TABLE user
 (
     `id`                   VARCHAR(50)  NOT NULL COMMENT '用户ID',
     `name`                 VARCHAR(255) NOT NULL COMMENT '用户名',
     `email`                VARCHAR(64)  NOT NULL COMMENT '用户邮箱',
-    `password`             VARCHAR(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '用户密码',
-    `status`               VARCHAR(50)  NOT NULL COMMENT '用户状态，启用或禁用',
+    `password`             VARCHAR(256) COMMENT '用户密码',
+    `enable`               BIT          NOT NULL DEFAULT 1 COMMENT '是否启用',
     `create_time`          BIGINT       NOT NULL COMMENT '创建时间',
     `update_time`          BIGINT       NOT NULL COMMENT '更新时间',
-    `language`             VARCHAR(30)                                            DEFAULT NULL COMMENT '语言',
-    `last_organization_id` VARCHAR(50)                                            DEFAULT NULL COMMENT '当前组织ID',
-    `phone`                VARCHAR(50)                                            DEFAULT NULL COMMENT '手机号',
-    `source`               VARCHAR(50)  NOT NULL COMMENT '来源：LOCAL OIDC CAS',
-    `last_project_id`      VARCHAR(50)                                            DEFAULT NULL COMMENT '当前项目ID',
+    `language`             VARCHAR(30) COMMENT '语言',
+    `last_organization_id` VARCHAR(50) COMMENT '当前组织ID',
+    `phone`                VARCHAR(50) COMMENT '手机号',
+    `source`               VARCHAR(50)  NOT NULL COMMENT '来源：LOCAL OIDC CAS OAUTH2',
+    `last_project_id`      VARCHAR(50) COMMENT '当前项目ID',
     `create_user`          VARCHAR(50)  NOT NULL COMMENT '创建人',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_email` (`email`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`),
-    KEY `idx_organization_id` (`last_organization_id`),
-    KEY `idx_project_id` (`last_project_id`),
-    KEY `idx_create_user` (`create_user`)
+    `update_user`          VARCHAR(50)  NOT NULL COMMENT '修改人',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户';
 
---
--- Table structure for table `user_role_relation`
---
 
-CREATE TABLE IF NOT EXISTS `user_role_relation`
+CREATE INDEX idx_name ON user (`name`);
+CREATE UNIQUE INDEX idx_email ON user (`email`);
+CREATE INDEX idx_create_time ON user (`create_time`);
+CREATE INDEX idx_update_time ON user (`update_time`);
+CREATE INDEX idx_organization_id ON user (`last_organization_id`);
+CREATE INDEX idx_project_id ON user (`last_project_id`);
+CREATE INDEX idx_create_user ON user (`update_user`);
+CREATE INDEX idx_update_user ON user (`update_user`);
+
+DROP TABLE IF EXISTS user_role_relation;
+CREATE TABLE user_role_relation
 (
     `id`          VARCHAR(50) NOT NULL COMMENT '用户组关系ID',
     `user_id`     VARCHAR(50) NOT NULL COMMENT '用户ID',
@@ -381,113 +363,111 @@ CREATE TABLE IF NOT EXISTS `user_role_relation`
     `source_id`   VARCHAR(50) NOT NULL COMMENT '组织或项目ID',
     `create_time` BIGINT      NOT NULL COMMENT '创建时间',
     `update_time` BIGINT      NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    KEY `idx_user_id` (`user_id`),
-    KEY `idx_group_id` (`role_id`),
-    KEY `idx_source_id` (`source_id`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户组关系';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户组关系';
 
---
--- Table structure for table `user_role_permission`
---
 
-CREATE TABLE IF NOT EXISTS `user_role_permission`
+CREATE INDEX idx_user_id ON user_role_relation (`user_id`);
+CREATE INDEX idx_group_id ON user_role_relation (`role_id`);
+CREATE INDEX idx_source_id ON user_role_relation (`source_id`);
+CREATE INDEX idx_create_time ON user_role_relation (`create_time`);
+CREATE INDEX idx_update_time ON user_role_relation (`update_time`);
+
+DROP TABLE IF EXISTS user_role_permission;
+CREATE TABLE user_role_permission
 (
-    `id`            VARCHAR(64)  NOT NULL,
+    `id`            VARCHAR(64)  NOT NULL COMMENT '',
     `role_id`       VARCHAR(64)  NOT NULL COMMENT '用户组ID',
     `permission_id` VARCHAR(128) NOT NULL COMMENT '权限ID',
     `module_id`     VARCHAR(64)  NOT NULL COMMENT '功能菜单',
-    PRIMARY KEY (`id`),
-    KEY `idx_group_id` (`role_id`),
-    KEY `idx_permission_id` (`permission_id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户组权限';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户组权限';
 
---
--- Table structure for table `user_key`
---
 
-CREATE TABLE IF NOT EXISTS `user_key`
+CREATE INDEX idx_group_id ON user_role_permission (`role_id`);
+CREATE INDEX idx_permission_id ON user_role_permission (`permission_id`);
+
+DROP TABLE IF EXISTS user_key;
+CREATE TABLE user_key
 (
     `id`          VARCHAR(50) NOT NULL COMMENT 'user_key ID',
     `create_user` VARCHAR(50) NOT NULL COMMENT '用户ID',
     `access_key`  VARCHAR(50) NOT NULL COMMENT 'access_key',
     `secret_key`  VARCHAR(50) NOT NULL COMMENT 'secret key',
     `create_time` BIGINT      NOT NULL COMMENT '创建时间',
-    `status`      VARCHAR(10) DEFAULT NULL COMMENT '状态',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `idx_ak` (`access_key`),
-    KEY `idx_create_user` (`create_user`)
+    `status`      VARCHAR(10) COMMENT '状态',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户api key';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户api key';
 
---
--- Table structure for table `organization`
---
 
-CREATE TABLE IF NOT EXISTS `organization`
+CREATE UNIQUE INDEX idx_ak ON user_key (`access_key`);
+CREATE INDEX idx_create_user ON user_key (`create_user`);
+
+DROP TABLE IF EXISTS organization;
+CREATE TABLE organization
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT '组织ID',
-    `name`        VARCHAR(255) NOT NULL COMMENT '组织名称',
-    `description` VARCHAR(500) DEFAULT NULL COMMENT '描述',
+    `num`         BIGINT       NOT NULL COMMENT '组织编号',
+    `name`        VARCHAR(100) NOT NULL COMMENT '组织名称',
+    `description` VARCHAR(500) COMMENT '描述',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `update_time` BIGINT       NOT NULL COMMENT '更新时间',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`)
+    `deleted`     BIT          NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `delete_user` VARCHAR(50) COMMENT '删除人',
+    `delete_time` BIGINT COMMENT '删除时间',
+    `enable`      BIT          NOT NULL DEFAULT 1 COMMENT '是否启用',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='组织';
+  COLLATE = utf8mb4_general_ci COMMENT = '组织';
 
---
--- Table structure for table `user_extend`
---
 
-CREATE TABLE IF NOT EXISTS `user_extend`
+CREATE INDEX idx_name ON organization (`name`);
+CREATE INDEX idx_create_user ON organization (`create_user`);
+CREATE INDEX idx_create_time ON organization (`create_time`);
+CREATE INDEX idx_update_time ON organization (`update_time`);
+CREATE INDEX idx_deleted ON organization (`deleted`);
+CREATE UNIQUE INDEX idx_num ON organization (`num`);
+
+DROP TABLE IF EXISTS user_extend;
+CREATE TABLE user_extend
 (
     `id`              VARCHAR(50) NOT NULL COMMENT '用户ID',
     `platform_info`   BLOB COMMENT '其他平台对接信息',
-    `selenium_server` VARCHAR(255) DEFAULT NULL COMMENT 'UI本地调试地址',
-    PRIMARY KEY (`id`)
+    `selenium_server` VARCHAR(255) COMMENT 'UI本地调试地址',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='用户扩展';
+  COLLATE = utf8mb4_general_ci COMMENT = '用户扩展';
 
---
--- Table structure for table `message_task_blob`
---
-
-CREATE TABLE IF NOT EXISTS `message_task_blob`
+DROP TABLE IF EXISTS message_task_blob;
+CREATE TABLE message_task_blob
 (
-    `id`       VARCHAR(50) NOT NULL,
+    `id`       VARCHAR(50) NOT NULL COMMENT '',
     `template` TEXT COMMENT '消息模版',
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='消息通知任务大字段';
+  COLLATE = utf8mb4_general_ci COMMENT = '消息通知任务大字段';
 
---
--- Table structure for table `plugin_blob`
---
-
-CREATE TABLE IF NOT EXISTS `plugin_blob`
+DROP TABLE IF EXISTS plugin_blob;
+CREATE TABLE plugin_blob
 (
     `id`          VARCHAR(50) NOT NULL COMMENT 'ID',
     `form_option` LONGBLOB COMMENT 'plugin form option',
     `form_script` LONGBLOB COMMENT 'plugin form script',
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='插件大字段';
+  COLLATE = utf8mb4_general_ci COMMENT = '插件大字段';
+
 
 -- set innodb lock wait timeout to default
 SET SESSION innodb_lock_wait_timeout = DEFAULT;

backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_4__project_ddl.sql

@@ -1,87 +1,68 @@
 -- set innodb lock wait timeout
 SET SESSION innodb_lock_wait_timeout = 7200;
 
---
--- Table structure for table `custom_field`
---
-
-
-CREATE TABLE IF NOT EXISTS `custom_field`
+DROP TABLE IF EXISTS custom_field;
+CREATE TABLE custom_field
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT '自定义字段ID',
     `name`        VARCHAR(255) NOT NULL COMMENT '自定义字段名称',
     `scene`       VARCHAR(30)  NOT NULL COMMENT '使用场景',
     `type`        VARCHAR(30)  NOT NULL COMMENT '自定义字段类型',
-    `remark`      VARCHAR(255)          DEFAULT NULL COMMENT '自定义字段备注',
+    `remark`      VARCHAR(255) COMMENT '自定义字段备注',
     `options`     TEXT COMMENT '自定义字段选项',
-    `system`      BIT(1)                DEFAULT b'0' COMMENT '是否是系统字段',
-    `global`      BIT(1)                DEFAULT b'0' COMMENT '是否是全局字段',
+    `system`      BIT                   DEFAULT 0 COMMENT '是否是系统字段',
+    `global`      BIT                   DEFAULT 0 COMMENT '是否是全局字段',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `update_time` BIGINT       NOT NULL COMMENT '更新时间',
-    `create_user` VARCHAR(50)           DEFAULT NULL COMMENT '创建人',
-    `project_id`  VARCHAR(50)           DEFAULT NULL COMMENT '项目ID',
-    `third_part`  BIT(1)       NOT NULL DEFAULT b'0' COMMENT '是否关联第三方',
-    PRIMARY KEY (`id`),
-    KEY `idx_global` (`global`),
-    KEY `idx_name` (`name`),
-    KEY `idx_scene` (`scene`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_project_id` (`project_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='自定义字段';
+    `create_user` VARCHAR(50) COMMENT '创建人',
+    `project_id`  VARCHAR(50) COMMENT '项目ID',
+    `third_part`  BIT          NOT NULL DEFAULT 0 COMMENT '是否关联第三方',
+    PRIMARY KEY (id)
+) COMMENT = '自定义字段';
 
 
---
--- Table structure for table `custom_field_template`
---
+CREATE INDEX idx_global ON custom_field (global);
+CREATE INDEX idx_name ON custom_field (name);
+CREATE INDEX idx_scene ON custom_field (scene);
+CREATE INDEX idx_create_time ON custom_field (create_time);
+CREATE INDEX idx_update_time ON custom_field (update_time);
+CREATE INDEX idx_create_user ON custom_field (create_user);
+CREATE INDEX idx_project_id ON custom_field (project_id);
 
-
-CREATE TABLE IF NOT EXISTS `custom_field_template`
+DROP TABLE IF EXISTS custom_field_template;
+CREATE TABLE custom_field_template
 (
     `id`            VARCHAR(50) NOT NULL COMMENT '自定义模版ID',
     `field_id`      VARCHAR(50) NOT NULL COMMENT '自定义字段ID',
     `template_id`   VARCHAR(50) NOT NULL COMMENT '模版ID',
     `scene`         VARCHAR(30) NOT NULL COMMENT '使用场景',
-    `required`      BIT(1)       DEFAULT NULL COMMENT '是否必填',
-    `pos`           INT          DEFAULT NULL COMMENT '排序字段',
+    `required`      BIT COMMENT '是否必填',
+    `pos`           INT COMMENT '排序字段',
     `default_value` LONGBLOB COMMENT '默认值',
-    `custom_data`   VARCHAR(255) DEFAULT NULL COMMENT '自定义数据',
-    `key`           VARCHAR(1)   DEFAULT NULL COMMENT '自定义表头',
-    PRIMARY KEY (`id`),
-    KEY `custom_field_template_field_id_index` (`field_id`),
-    KEY `custom_field_template_template_id_index` (`template_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='自定义模版';
+    `custom_data`   VARCHAR(255) COMMENT '自定义数据',
+    `key`           VARCHAR(1) COMMENT '自定义表头',
+    PRIMARY KEY (id)
+) COMMENT = '自定义模版';
 
 
---
--- Table structure for table `custom_function`
---
+CREATE INDEX custom_field_template_field_id_index ON custom_field_template (field_id);
+CREATE INDEX custom_field_template_template_id_index ON custom_field_template (template_id);
 
-
-CREATE TABLE IF NOT EXISTS `custom_function`
+DROP TABLE IF EXISTS custom_function;
+CREATE TABLE custom_function
 (
-    `id`          VARCHAR(50)  NOT NULL,
+    `id`          VARCHAR(50)  NOT NULL COMMENT '',
     `name`        VARCHAR(255) NOT NULL COMMENT '函数名',
-    `tags`        VARCHAR(1000) DEFAULT NULL COMMENT '标签',
-    `description` VARCHAR(500)  DEFAULT NULL COMMENT '函数描述',
-    PRIMARY KEY (`id`),
-    KEY `name` (`name`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='自定义函数-代码片段';
+    `tags`        VARCHAR(1000) COMMENT '标签',
+    `description` VARCHAR(500) COMMENT '函数描述',
+    PRIMARY KEY (id)
+) COMMENT = '自定义函数-代码片段';
 
 
---
--- Table structure for table `fake_error`
---
+CREATE INDEX name ON custom_function (name);
 
-
-CREATE TABLE IF NOT EXISTS `fake_error`
+DROP TABLE IF EXISTS fake_error;
+CREATE TABLE fake_error
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT '误报ID',
     `project_id`  VARCHAR(50)  NOT NULL COMMENT '项目ID',
@@ -91,29 +72,42 @@ CREATE TABLE IF NOT EXISTS `fake_error`
     `update_user` VARCHAR(64)  NOT NULL COMMENT '更新人',
     `error_code`  VARCHAR(255) NOT NULL COMMENT '错误码',
     `match_type`  VARCHAR(255) NOT NULL COMMENT '匹配类型',
-    `status`      BIT(1) DEFAULT NULL COMMENT '状态',
-    PRIMARY KEY (`id`),
-    KEY `idx_project_id` (`project_id`),
-    KEY `project_id_status` (`project_id`, `status`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_time` (`update_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_update_user` (`update_user`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='误报库';
+    `status`      BIT COMMENT '状态',
+    PRIMARY KEY (id)
+) COMMENT = '误报库';
 
 
---
--- Table structure for table `file_metadata`
---
+CREATE INDEX idx_project_id ON fake_error (project_id);
+CREATE INDEX project_id_status ON fake_error (project_id, status);
+CREATE INDEX idx_create_time ON fake_error (create_time);
+CREATE INDEX idx_update_time ON fake_error (update_time);
+CREATE INDEX idx_create_user ON fake_error (create_user);
+CREATE INDEX idx_update_user ON fake_error (update_user);
+
+DROP TABLE IF EXISTS file_association;
+CREATE TABLE file_association
+(
+    `id`               VARCHAR(50) NOT NULL COMMENT '',
+    `type`             VARCHAR(50) NOT NULL COMMENT '模块类型,服务拆分后就是各个服务',
+    `source_id`        VARCHAR(50) NOT NULL COMMENT '各个模块关联时自身Id/比如API/CASE/SCENAEIO',
+    `source_item_id`   VARCHAR(50) NOT NULL COMMENT '对应资源引用时具体id，如一个用例引用多个文件',
+    `file_metadata_id` VARCHAR(50) NOT NULL COMMENT '文件id',
+    `file_type`        VARCHAR(50) NOT NULL COMMENT '文件类型',
+    `project_id`       VARCHAR(50) NOT NULL COMMENT '项目id',
+    PRIMARY KEY (id)
+) COMMENT = '文件关联资源关系(分散到模块)';
 
 
-CREATE TABLE IF NOT EXISTS `file_metadata`
+CREATE INDEX idx_file_metadata_id ON file_association (file_metadata_id);
+CREATE INDEX idx_project_id ON file_association (project_id);
+CREATE INDEX idx_source_id ON file_association (source_id);
+
+DROP TABLE IF EXISTS file_metadata;
+CREATE TABLE file_metadata
 (
     `id`            VARCHAR(50)  NOT NULL COMMENT '文件ID',
     `name`          VARCHAR(255) NOT NULL COMMENT '文件名',
-    `type`          VARCHAR(64)           DEFAULT NULL COMMENT '文件类型',
+    `type`          VARCHAR(64) COMMENT '文件类型',
     `size`          BIGINT       NOT NULL COMMENT '文件大小',
     `create_time`   BIGINT       NOT NULL COMMENT '创建时间',
     `update_time`   BIGINT       NOT NULL COMMENT '更新时间',
@@ -121,329 +115,253 @@ CREATE TABLE IF NOT EXISTS `file_metadata`
     `storage`       VARCHAR(50)  NOT NULL DEFAULT 'MINIO' COMMENT '文件存储方式',
     `create_user`   VARCHAR(50)  NOT NULL COMMENT '创建人',
     `update_user`   VARCHAR(50)  NOT NULL COMMENT '修改人',
-    `tags`          VARCHAR(1000)         DEFAULT NULL COMMENT '标签',
-    `description`   VARCHAR(500)          DEFAULT NULL COMMENT '描述',
-    `module_id`     VARCHAR(50)           DEFAULT NULL COMMENT '文件所属模块',
-    `load_jar`      BIT(1)                DEFAULT b'0' COMMENT '是否加载jar（开启后用于接口测试执行时使用）',
-    `path`          VARCHAR(1000)         DEFAULT NULL COMMENT '文件存储路径',
-    `resource_type` VARCHAR(50)           DEFAULT NULL COMMENT '资源作用范围，主要兼容2.1版本前的历史数据，后续版本不再产生数据',
-    `latest`        BIT(1)       NOT NULL DEFAULT b'1' COMMENT '是否是最新版',
+    `tags`          VARCHAR(1000) COMMENT '标签',
+    `description`   VARCHAR(500) COMMENT '描述',
+    `module_id`     VARCHAR(50) COMMENT '文件所属模块',
+    `load_jar`      BIT                   DEFAULT 0 COMMENT '是否加载jar（开启后用于接口测试执行时使用）',
+    `path`          VARCHAR(1000) COMMENT '文件存储路径',
+    `resource_type` VARCHAR(50) COMMENT '资源作用范围，主要兼容2.1版本前的历史数据，后续版本不再产生数据',
+    `latest`        BIT          NOT NULL DEFAULT 1 COMMENT '是否是最新版',
     `ref_id`        VARCHAR(50)  NOT NULL COMMENT '同版本数据关联的ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_file_name` (`name`),
-    KEY `idx_latest` (`latest`),
-    KEY `idx_ref_id` (`ref_id`),
-    KEY `idx_storage` (`storage`),
-    KEY `idx_module_id` (`module_id`),
-    KEY `idx_project_id` (`project_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='文件基础信息';
+    PRIMARY KEY (id)
+) COMMENT = '文件基础信息';
 
 
---
--- Table structure for table `file_module`
---
+CREATE INDEX idx_file_name ON file_metadata (name);
+CREATE INDEX idx_latest ON file_metadata (latest);
+CREATE INDEX idx_ref_id ON file_metadata (ref_id);
+CREATE INDEX idx_storage ON file_metadata (storage);
+CREATE INDEX idx_module_id ON file_metadata (module_id);
+CREATE INDEX idx_project_id ON file_metadata (project_id);
 
-
-CREATE TABLE IF NOT EXISTS `file_module`
+DROP TABLE IF EXISTS file_module;
+CREATE TABLE file_module
 (
     `id`          VARCHAR(50) NOT NULL COMMENT 'ID',
     `project_id`  VARCHAR(50) NOT NULL COMMENT '项目ID',
     `name`        VARCHAR(64) NOT NULL COMMENT '模块名称',
-    `parent_id`   VARCHAR(50) DEFAULT NULL COMMENT '父级ID',
-    `level`       INT         DEFAULT '1' COMMENT '层数',
+    `parent_id`   VARCHAR(50) COMMENT '父级ID',
+    `level`       INT         DEFAULT 1 COMMENT '层数',
     `create_time` BIGINT      NOT NULL COMMENT '创建时间',
     `update_time` BIGINT      NOT NULL COMMENT '更新时间',
-    `pos`         DOUBLE      DEFAULT NULL COMMENT '排序用的标识',
-    `create_user` VARCHAR(50) DEFAULT NULL COMMENT '创建人',
+    `pos`         DOUBLE COMMENT '排序用的标识',
+    `create_user` VARCHAR(50) COMMENT '创建人',
     `module_type` VARCHAR(20) DEFAULT 'module' COMMENT '模块类型: module/repository',
-    PRIMARY KEY (`id`),
-    KEY `idx_project_id` (`project_id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_update_timed` (`update_time`),
-    KEY `idx_pos` (`pos`),
-    KEY `idx_create_user` (`create_user`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='文件管理模块';
+    PRIMARY KEY (id)
+) COMMENT = '文件管理模块';
 
 
---
--- Table structure for table `project`
---
+CREATE INDEX idx_project_id ON file_module (project_id);
+CREATE INDEX idx_name ON file_module (name);
+CREATE INDEX idx_create_time ON file_module (create_time);
+CREATE INDEX idx_update_timed ON file_module (update_time);
+CREATE INDEX idx_pos ON file_module (pos);
+CREATE INDEX idx_create_user ON file_module (create_user);
 
-
-CREATE TABLE IF NOT EXISTS `project`
+DROP TABLE IF EXISTS project;
+CREATE TABLE project
 (
     `id`              VARCHAR(50)  NOT NULL COMMENT '项目ID',
+    `num`             BIGINT(255)  NOT NULL COMMENT '项目编号',
     `organization_id` VARCHAR(50)  NOT NULL COMMENT '组织ID',
     `name`            VARCHAR(255) NOT NULL COMMENT '项目名称',
-    `description`     VARCHAR(500) DEFAULT NULL COMMENT '项目描述',
+    `description`     VARCHAR(500) COMMENT '项目描述',
     `create_time`     BIGINT       NOT NULL COMMENT '创建时间',
     `update_time`     BIGINT       NOT NULL COMMENT '更新时间',
-    `create_user`     VARCHAR(50)  DEFAULT NULL COMMENT '创建人',
-    `system_id`       VARCHAR(50)  DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_organization_id` (`organization_id`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idex_update_time` (`update_time`),
-    KEY `idx_name` (`name`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='项目';
+    `create_user`     VARCHAR(50) COMMENT '创建人',
+    `delete_time`     BIGINT(255) COMMENT '删除时间',
+    `deleted`         BIT          NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `delete_user`     VARCHAR(50) COMMENT '删除人',
+    `enable`          BIT COMMENT '是否启用',
+    PRIMARY KEY (id)
+) COMMENT = '项目';
 
 
---
--- Table structure for table `project_application`
---
+CREATE INDEX idx_organization_id ON project (organization_id);
+CREATE INDEX idx_create_user ON project (create_user);
+CREATE INDEX idx_create_time ON project (create_time);
+CREATE INDEX idex_update_time ON project (update_time);
+CREATE INDEX idx_name ON project (name);
+CREATE INDEX idx_deleted ON project (deleted);
+CREATE UNIQUE INDEX idx_num ON project (num);
 
-
-CREATE TABLE IF NOT EXISTS `project_application`
+DROP TABLE IF EXISTS project_application;
+CREATE TABLE project_application
 (
     `project_id` VARCHAR(50) NOT NULL COMMENT '项目ID',
     `type`       VARCHAR(50) NOT NULL COMMENT '配置项',
-    `type_value` VARCHAR(255) DEFAULT NULL COMMENT '配置值',
-    PRIMARY KEY (`project_id`, `type`),
-    KEY `idx_project_application_type` (`type`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='项目应用';
+    `type_value` VARCHAR(255) COMMENT '配置值',
+    PRIMARY KEY (project_id, type)
+) COMMENT = '项目应用';
 
 
---
--- Table structure for table `project_version`
---
+CREATE INDEX idx_project_application_type ON project_application (type);
 
-
-CREATE TABLE IF NOT EXISTS `project_version`
+DROP TABLE IF EXISTS project_version;
+CREATE TABLE project_version
 (
     `id`           VARCHAR(50)  NOT NULL COMMENT '版本ID',
     `project_id`   VARCHAR(50)  NOT NULL COMMENT '项目ID',
     `name`         VARCHAR(255) NOT NULL COMMENT '版本名称',
-    `description`  VARCHAR(500) DEFAULT NULL COMMENT '描述',
-    `status`       VARCHAR(20)  DEFAULT NULL COMMENT '状态',
-    `latest`       BIT(1)       NOT NULL COMMENT '是否是最新版',
-    `publish_time` BIGINT       DEFAULT NULL COMMENT '发布时间',
-    `start_time`   BIGINT       DEFAULT NULL COMMENT '开始时间',
-    `end_time`     BIGINT       DEFAULT NULL COMMENT '结束时间',
+    `description`  VARCHAR(500) COMMENT '描述',
+    `status`       VARCHAR(20) COMMENT '状态',
+    `latest`       BIT          NOT NULL COMMENT '是否是最新版',
+    `publish_time` BIGINT COMMENT '发布时间',
+    `start_time`   BIGINT COMMENT '开始时间',
+    `end_time`     BIGINT COMMENT '结束时间',
     `create_time`  BIGINT       NOT NULL COMMENT '创建时间',
     `create_user`  VARCHAR(50)  NOT NULL COMMENT '创建人',
-    PRIMARY KEY (`id`),
-    KEY `idx_project_id` (`project_id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_latest` (`latest`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='版本管理';
+    PRIMARY KEY (id)
+) COMMENT = '版本管理';
 
 
---
--- Table structure for table `file_module_blob`
---
+CREATE INDEX idx_project_id ON project_version (project_id);
+CREATE INDEX idx_name ON project_version (name);
+CREATE INDEX idx_create_time ON project_version (create_time);
+CREATE INDEX idx_create_user ON project_version (create_user);
+CREATE INDEX idx_latest ON project_version (latest);
 
-
-CREATE TABLE IF NOT EXISTS `file_module_blob`
+DROP TABLE IF EXISTS file_module_blob;
+CREATE TABLE file_module_blob
 (
     `id`                   VARCHAR(50) NOT NULL COMMENT 'ID',
     `repository_desc`      LONGBLOB COMMENT '存储库描述',
-    `repository_path`      VARCHAR(255) DEFAULT NULL COMMENT '存储库路径',
-    `repository_user_name` VARCHAR(255) DEFAULT NULL COMMENT '存储库Token',
-    `repository_token`     VARCHAR(255) DEFAULT NULL COMMENT '存储库Token',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='文件管理模块大字段';
+    `repository_path`      VARCHAR(255) COMMENT '存储库路径',
+    `repository_user_name` VARCHAR(255) COMMENT '存储库Token',
+    `repository_token`     VARCHAR(255) COMMENT '存储库Token',
+    PRIMARY KEY (id)
+) COMMENT = '文件管理模块大字段';
 
-
---
--- Table structure for table `custom_function_blob`
---
-
-
-CREATE TABLE IF NOT EXISTS `custom_function_blob`
+DROP TABLE IF EXISTS custom_function_blob;
+CREATE TABLE custom_function_blob
 (
-    `id`     VARCHAR(50) NOT NULL,
+    `id`     VARCHAR(50) NOT NULL COMMENT '',
     `params` LONGBLOB COMMENT '参数列表',
     `script` LONGBLOB COMMENT '函数体',
     `result` LONGBLOB COMMENT '执行结果',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='自定义函数-代码片段大字段';
+    PRIMARY KEY (id)
+) COMMENT = '自定义函数-代码片段大字段';
 
-
---
--- Table structure for table `fake_error_blob`
---
-
-
-CREATE TABLE IF NOT EXISTS `fake_error_blob`
+DROP TABLE IF EXISTS fake_error_blob;
+CREATE TABLE fake_error_blob
 (
     `id`          VARCHAR(50) NOT NULL COMMENT 'Test ID',
     `content`     LONGBLOB COMMENT '内容',
     `description` LONGBLOB COMMENT '报告内容',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='误报库大字段';
+    PRIMARY KEY (id)
+) COMMENT = '误报库大字段';
 
-
---
--- Table structure for table `file_metadata_blob`
---
-
-
-CREATE TABLE IF NOT EXISTS `file_metadata_blob`
+DROP TABLE IF EXISTS file_metadata_blob;
+CREATE TABLE file_metadata_blob
 (
     `id`       VARCHAR(50) NOT NULL COMMENT '文件ID',
     `git_info` LONGBLOB COMMENT '储存库',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='文件基础信息大字段';
+    PRIMARY KEY (id)
+) COMMENT = '文件基础信息大字段';
 
-
---
--- Table structure for table `project_extend`
---
-
-
-CREATE TABLE IF NOT EXISTS `project_extend`
+DROP TABLE IF EXISTS project_extend;
+CREATE TABLE project_extend
 (
     `id`                  VARCHAR(50) NOT NULL COMMENT '项目ID',
-    `tapd_id`             VARCHAR(50)          DEFAULT NULL,
-    `jira_key`            VARCHAR(50)          DEFAULT NULL,
-    `zentao_id`           VARCHAR(50)          DEFAULT NULL,
-    `azure_devops_id`     VARCHAR(50)          DEFAULT NULL,
-    `case_template_id`    VARCHAR(50)          DEFAULT NULL COMMENT '用例模版ID',
-    `azure_filter_id`     VARCHAR(50)          DEFAULT NULL COMMENT 'azure 过滤需求的 parent workItem ID',
+    `tapd_id`             VARCHAR(50) COMMENT '',
+    `jira_key`            VARCHAR(50) COMMENT '',
+    `zentao_id`           VARCHAR(50) COMMENT '',
+    `azure_devops_id`     VARCHAR(50) COMMENT '',
+    `case_template_id`    VARCHAR(50) COMMENT '用例模版ID',
+    `azure_filter_id`     VARCHAR(50) COMMENT 'azure 过滤需求的 parent workItem ID',
     `platform`            VARCHAR(20) NOT NULL DEFAULT 'Local' COMMENT '项目使用哪个平台的模板',
-    `third_part_template` BIT(1)               DEFAULT b'0' COMMENT '是否使用第三方平台缺陷模板',
-    `version_enable`      BIT(1)               DEFAULT b'1' COMMENT '是否开启版本管理',
-    `issue_config`        LONGBLOB,
-    `api_template_id`     VARCHAR(64)          DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_project_id` (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='项目扩展';
+    `third_part_template` BIT                  DEFAULT 0 COMMENT '是否使用第三方平台缺陷模板',
+    `version_enable`      BIT                  DEFAULT 1 COMMENT '是否开启版本管理',
+    `issue_config`        VARCHAR(2000) COMMENT '',
+    `api_template_id`     VARCHAR(64) COMMENT '',
+    PRIMARY KEY (id)
+) COMMENT = '项目扩展';
 
 
---
--- Table structure for table `functional_case_template`
---
+CREATE INDEX idx_project_id ON project_extend (id);
 
-
-CREATE TABLE IF NOT EXISTS `functional_case_template`
+DROP TABLE IF EXISTS functional_case_template;
+CREATE TABLE functional_case_template
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT 'ID',
     `name`        VARCHAR(255) NOT NULL COMMENT '名称',
-    `description` VARCHAR(500)          DEFAULT NULL COMMENT '描述',
-    `system`      BIT(1)       NOT NULL DEFAULT b'0' COMMENT '是否是系统模板',
+    `description` VARCHAR(500) COMMENT '描述',
+    `internal`    BIT          NOT NULL DEFAULT 0 COMMENT '是否是内置模板',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人',
     `project_id`  VARCHAR(50)  NOT NULL COMMENT '项目ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_system` (`system`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_project_id` (`project_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='功能用例模版';
+    PRIMARY KEY (id)
+) COMMENT = '功能用例模版';
 
 
---
--- Table structure for table `functional_case_template_extend`
---
+CREATE INDEX idx_name ON functional_case_template (name);
+CREATE INDEX idx_system ON functional_case_template (internal);
+CREATE INDEX idx_create_time ON functional_case_template (create_time);
+CREATE INDEX idx_create_user ON functional_case_template (create_user);
+CREATE INDEX idx_project_id ON functional_case_template (project_id);
 
-
-CREATE TABLE IF NOT EXISTS `functional_case_template_extend`
+DROP TABLE IF EXISTS functional_case_template_extend;
+CREATE TABLE functional_case_template_extend
 (
     `id`               VARCHAR(50) NOT NULL COMMENT '模板ID',
-    `case_name`        VARCHAR(255)         DEFAULT NULL COMMENT '用例名称模板',
+    `case_name`        VARCHAR(255) COMMENT '用例名称模板',
     `prerequisite`     TEXT COMMENT '前置条件模板',
     `step_description` TEXT COMMENT '步骤描述模板',
     `expected_result`  TEXT COMMENT '预期结果模板',
     `actual_result`    TEXT COMMENT '实际结果模板',
     `step_model`       VARCHAR(64) NOT NULL DEFAULT 'Step' COMMENT '编辑模式模板：步骤模式/文本模式',
     `steps`            TEXT COMMENT '用例步骤',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='功能用例模版扩展';
+    PRIMARY KEY (id)
+) COMMENT = '功能用例模版扩展';
 
-
---
--- Table structure for table `bug_template_extend`
---
-
-
-CREATE TABLE IF NOT EXISTS `bug_template_extend`
+DROP TABLE IF EXISTS bug_template_extend;
+CREATE TABLE bug_template_extend
 (
     `id`      VARCHAR(50) NOT NULL COMMENT '缺陷模板ID',
-    `title`   VARCHAR(255) DEFAULT NULL COMMENT '缺陷标题模板',
+    `title`   VARCHAR(255) COMMENT '缺陷标题模板',
     `content` TEXT COMMENT '缺陷内容模板',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='缺陷模板扩展';
+    PRIMARY KEY (id)
+) COMMENT = '缺陷模板扩展';
 
-
---
--- Table structure for table `bug_template`
---
-
-
-CREATE TABLE IF NOT EXISTS `bug_template`
+DROP TABLE IF EXISTS bug_template;
+CREATE TABLE bug_template
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT 'ID',
     `name`        VARCHAR(255) NOT NULL COMMENT '名称',
-    `description` VARCHAR(500)          DEFAULT NULL COMMENT '描述',
-    `system`      BIT(1)       NOT NULL DEFAULT b'0' COMMENT '是否是系统模板',
+    `description` VARCHAR(500) COMMENT '描述',
+    `internal`    BIT          NOT NULL DEFAULT 0 COMMENT '是否是内置模板',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人',
     `project_id`  VARCHAR(50)  NOT NULL COMMENT '项目ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_system` (`system`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_project_id` (`project_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='缺陷模版';
+    PRIMARY KEY (id)
+) COMMENT = '缺陷模版';
 
 
---
--- Table structure for table `api_template`
---
+CREATE INDEX idx_name ON bug_template (name);
+CREATE INDEX idx_system ON bug_template (internal);
+CREATE INDEX idx_create_time ON bug_template (create_time);
+CREATE INDEX idx_create_user ON bug_template (create_user);
+CREATE INDEX idx_project_id ON bug_template (project_id);
 
-
-CREATE TABLE IF NOT EXISTS `api_template`
+DROP TABLE IF EXISTS api_template;
+CREATE TABLE api_template
 (
     `id`          VARCHAR(50)  NOT NULL COMMENT 'ID',
     `name`        VARCHAR(255) NOT NULL COMMENT '名称',
-    `description` VARCHAR(500)          DEFAULT NULL COMMENT '描述',
-    `system`      BIT(1)       NOT NULL DEFAULT b'0' COMMENT '是否是系统模板',
+    `description` VARCHAR(500) COMMENT '描述',
+    `internal`    BIT          NOT NULL DEFAULT 0 COMMENT '是否是内置模板',
     `create_time` BIGINT       NOT NULL COMMENT '创建时间',
     `create_user` VARCHAR(50)  NOT NULL COMMENT '创建人',
     `project_id`  VARCHAR(50)  NOT NULL COMMENT '项目ID',
-    PRIMARY KEY (`id`),
-    KEY `idx_name` (`name`),
-    KEY `idx_system` (`system`),
-    KEY `idx_create_time` (`create_time`),
-    KEY `idx_create_user` (`create_user`),
-    KEY `idx_project_id` (`project_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4
-  COLLATE = utf8mb4_general_ci COMMENT ='接口定义模板';
+    PRIMARY KEY (id)
+) COMMENT = '接口定义模板';
+
+
+CREATE INDEX idx_name ON api_template (name);
+CREATE INDEX idx_system ON api_template (internal);
+CREATE INDEX idx_create_time ON api_template (create_time);
+CREATE INDEX idx_create_user ON api_template (create_user);
+CREATE INDEX idx_project_id ON api_template (project_id);
 
 
 -- set innodb lock wait timeout to default

backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql

@@ -2,22 +2,22 @@
 SET SESSION innodb_lock_wait_timeout = 7200;
 
 -- 初始化组织
-INSERT INTO organization (id, name, description, create_user, create_time, update_time) VALUES (uuid(), '默认组织', '系统默认创建的组织', 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000);
+INSERT INTO organization (id, num, name, description, create_user, create_time, update_time) VALUES (uuid(), 1000, '默认组织', '系统默认创建的组织', 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000);
 -- 初始化项目
-INSERT INTO project (id, organization_id, name, description, create_user, create_time, update_time) VALUES (uuid(), (SELECT id FROM organization WHERE name LIKE '默认组织'), '默认项目', '系统默认创建的项目', 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000);
+INSERT INTO project (id, num, organization_id, name, description, create_user, create_time, update_time) VALUES (uuid(), 10001000, (SELECT id FROM organization WHERE name LIKE '默认组织'), '默认项目', '系统默认创建的项目', 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000);
 
 -- 初始化用户
-insert into user(id, name, email, password, status, create_time, update_time, language, last_organization_id, phone, source, last_project_id, create_user)
-VALUES ('admin', 'Administrator', 'admin@metersphere.io', MD5('metersphere'), '1', UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, NULL, NUll, '', 'LOCAL', NULL, 'admin');
+insert into user(id, name, email, password, create_time, update_time, language, last_organization_id, phone, source, last_project_id, create_user, update_user)
+VALUES ('admin', 'Administrator', 'admin@metersphere.io', MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, NULL, NUll, '', 'LOCAL', NULL, 'admin', 'admin');
 
 -- 初始化用户组
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('admin', '系统管理员(系统)', '默认用户组', 1, 'SYSTEM', 1621224000000, 1621224000000, 'admin', 'global');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('project_admin', '项目管理员(系统)', '项目管理员', 1, 'PROJECT', 1620674220004, 1620674220000, 'admin', 'global');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('project_member', '项目成员(系统)', '项目成员', 1, 'PROJECT', 1620674220005, 1620674220000, 'admin', 'global');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('read_only', '只读用户(系统)', '只读用户', 1, 'PROJECT', 1620674220006, 1620674220000, 'admin', 'global');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('super', '超级管理员(系统)', '拥有系统全部组织以及项目的操作权限', 1, 'SYSTEM', 1671008474000, 1671008474000, 'admin', 'system');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('org_admin', '组织管理员(系统)', '组织管理员', 1, 'ORGANIZATION', 1620674220007, 1620674220000, 'admin', 'global');
-INSERT INTO user_role (id, name, description, `system`, type, create_time, update_time, create_user, scope_id) VALUES ('org_member', '组织成员(系统)', '组织成员', 1, 'ORGANIZATION', 1620674220008, 1620674220000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('admin', '系统管理员(系统)', '默认用户组', 1, 'SYSTEM', 1621224000000, 1621224000000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('project_admin', '项目管理员(系统)', '项目管理员', 1, 'PROJECT', 1620674220004, 1620674220000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('project_member', '项目成员(系统)', '项目成员', 1, 'PROJECT', 1620674220005, 1620674220000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('read_only', '只读用户(系统)', '只读用户', 1, 'PROJECT', 1620674220006, 1620674220000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('super', '超级管理员(系统)', '拥有系统全部组织以及项目的操作权限', 1, 'SYSTEM', 1671008474000, 1671008474000, 'admin', 'system');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('org_admin', '组织管理员(系统)', '组织管理员', 1, 'ORGANIZATION', 1620674220007, 1620674220000, 'admin', 'global');
+INSERT INTO user_role (id, name, description, internal, type, create_time, update_time, create_user, scope_id) VALUES ('org_member', '组织成员(系统)', '组织成员', 1, 'ORGANIZATION', 1620674220008, 1620674220000, 'admin', 'global');
 
 -- 初始化用户和组的关系
 INSERT INTO user_role_relation (id, user_id, role_id, source_id, create_time, update_time) VALUES ('c3bb9b4f-46d8-4952-9681-8889974487d1', 'admin', 'super', 'system', 1684747668375, 1684747668375);

backend/framework/sdk/src/main/java/io/metersphere/sdk/service/BaseUserService.java

@@ -6,7 +6,6 @@ import io.metersphere.project.mapper.ProjectMapper;
 import io.metersphere.sdk.constants.UserRoleConstants;
 import io.metersphere.sdk.constants.UserRoleType;
 import io.metersphere.sdk.constants.UserSource;
-import io.metersphere.sdk.constants.UserStatus;
 import io.metersphere.sdk.controller.handler.ResultHolder;
 import io.metersphere.sdk.dto.*;
 import io.metersphere.sdk.exception.MSException;
@@ -22,6 +21,7 @@ import io.metersphere.system.mapper.UserRolePermissionMapper;
 import io.metersphere.system.mapper.UserRoleRelationMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
@@ -61,7 +61,7 @@ public class BaseUserService {
         if (userDTO == null) {
             return null;
         }
-        if (StringUtils.equals(userDTO.getStatus(), UserStatus.DISABLED)) {
+        if (BooleanUtils.isFalse(userDTO.getEnable())) {
             throw new DisabledAccountException();
         }
         UserRolePermissionDTO dto = getUserRolePermission(userId);
@@ -313,7 +313,7 @@ public class BaseUserService {
         }
         // 执行变更
         userMapper.updateByPrimaryKeySelective(user);
-        if (StringUtils.equals(user.getStatus(), UserStatus.DISABLED)) {
+        if (BooleanUtils.isFalse(user.getEnable())) {
             SessionUtils.kickOutUser(user.getId());
         }
     }

backend/services/system-setting/src/test/java/io/metersphere/system/controller/UserControllerTests.java

@@ -48,7 +48,6 @@ public class UserControllerTests {
         user.setName("user");
         user.setSource("LOCAL");
         user.setEmail("bin@fit2cloud.com");
-        user.setStatus("enabled");
 
         user.setSeleniumServer("http://localhost:4444");
 
@@ -130,7 +129,6 @@ public class UserControllerTests {
             user.setName("batch3_" + i);
             user.setSource("LOCAL");
             user.setEmail("bin@fit2cloud.com");
-            user.setStatus("enabled");
             users.add(user);
         }