build: system domain

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

@@ -12,7 +12,7 @@ import lombok.Data;
 public class MessageTask implements Serializable {
     @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{message_task.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 255, message = "{message_task.id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{message_task.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
     @Schema(title = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -40,7 +40,7 @@ public class MessageTask implements Serializable {
 
     @Schema(title = "具体测试的ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{message_task.test_id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 255, message = "{message_task.test_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{message_task.test_id.length_range}", groups = {Created.class, Updated.class})
     private String testId;
 
     @Schema(title = "创建时间")
@@ -48,7 +48,7 @@ public class MessageTask implements Serializable {
 
     @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{message_task.project_id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{message_task.project_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{message_task.project_id.length_range}", groups = {Created.class, Updated.class})
     private String projectId;
 
     private static final long serialVersionUID = 1L;

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

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class MessageTaskBlob implements Serializable {
     @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{message_task_blob.message_task_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{message_task_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 255, message = "{message_task_blob.message_task_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{message_task_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String messageTaskId;
+    private String id;
 
     @Schema(title = "消息模版")
     private String template;

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

@@ -104,73 +104,73 @@ public class MessageTaskBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andMessageTaskIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("message_task_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("message_task_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("message_task_id =", value, "messageTaskId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("message_task_id <>", value, "messageTaskId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("message_task_id >", value, "messageTaskId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("message_task_id >=", value, "messageTaskId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("message_task_id <", value, "messageTaskId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("message_task_id <=", value, "messageTaskId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("message_task_id like", value, "messageTaskId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("message_task_id not like", value, "messageTaskId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("message_task_id in", values, "messageTaskId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("message_task_id not in", values, "messageTaskId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("message_task_id between", value1, value2, "messageTaskId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andMessageTaskIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("message_task_id not between", value1, value2, "messageTaskId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
     }

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

@@ -27,7 +27,7 @@ public class Notification implements Serializable {
 
     @Schema(title = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{notification.title.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 100, message = "{notification.title.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 255, message = "{notification.title.length_range}", groups = {Created.class, Updated.class})
     private String title;
 
     @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -60,7 +60,7 @@ public class Notification implements Serializable {
 
     @Schema(title = "资源名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{notification.resource_name.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 100, message = "{notification.resource_name.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 255, message = "{notification.resource_name.length_range}", groups = {Created.class, Updated.class})
     private String resourceName;
 
     private static final long serialVersionUID = 1L;

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

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class PluginBlob implements Serializable {
     @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{plugin_blob.plugin_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{plugin_blob.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{plugin_blob.plugin_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{plugin_blob.id.length_range}", groups = {Created.class, Updated.class})
-    private String pluginId;
+    private String id;
 
     @Schema(title = "plugin form option")
     private byte[] formOption;

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

@@ -104,73 +104,73 @@ public class PluginBlobExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andPluginIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("plugin_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("plugin_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("plugin_id =", value, "pluginId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("plugin_id <>", value, "pluginId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("plugin_id >", value, "pluginId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("plugin_id >=", value, "pluginId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("plugin_id <", value, "pluginId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("plugin_id <=", value, "pluginId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("plugin_id like", value, "pluginId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("plugin_id not like", value, "pluginId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("plugin_id in", values, "pluginId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("plugin_id not in", values, "pluginId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("plugin_id between", value1, value2, "pluginId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andPluginIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("plugin_id not between", value1, value2, "pluginId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
     }

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

@@ -22,7 +22,7 @@ public class TestResource implements Serializable {
 
     @Schema(title = "资源节点状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{test_resource.status.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{test_resource.status.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 20, message = "{test_resource.status.length_range}", groups = {Created.class, Updated.class})
     private String status;
 
     @Schema(title = "创建时间")

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

@@ -17,7 +17,7 @@ public class TestResourcePool implements Serializable {
 
     @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{test_resource_pool.name.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{test_resource_pool.name.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 255, message = "{test_resource_pool.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "类型", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -30,7 +30,7 @@ public class TestResourcePool implements Serializable {
 
     @Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{test_resource_pool.status.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 20, message = "{test_resource_pool.status.length_range}", groups = {Created.class, Updated.class})
     private String status;
 
     @Schema(title = "创建时间")

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

@@ -17,7 +17,7 @@ public class User implements Serializable {
 
     @Schema(title = "用户名", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user.name.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{user.name.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 255, message = "{user.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "用户邮箱", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -58,7 +58,7 @@ public class User implements Serializable {
 
     @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user.create_user.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 100, message = "{user.create_user.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{user.create_user.length_range}", groups = {Created.class, Updated.class})
     private String createUser;
 
     private static final long serialVersionUID = 1L;

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

@@ -11,9 +11,9 @@ import lombok.Data;
 @Data
 public class UserExtend implements Serializable {
     @Schema(title = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{user_extend.user_id.not_blank}", groups = {Updated.class})
+    @NotBlank(message = "{user_extend.id.not_blank}", groups = {Created.class, Updated.class})
-    @Size(min = 1, max = 50, message = "{user_extend.user_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{user_extend.id.length_range}", groups = {Created.class, Updated.class})
-    private String userId;
+    private String id;
 
     @Schema(title = "UI本地调试地址")
     private String seleniumServer;

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

@@ -104,73 +104,73 @@ public class UserExtendExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andUserIdIsNull() {
+        public Criteria andIdIsNull() {
-            addCriterion("user_id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNotNull() {
+        public Criteria andIdIsNotNull() {
-            addCriterion("user_id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdEqualTo(String value) {
+        public Criteria andIdEqualTo(String value) {
-            addCriterion("user_id =", value, "userId");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotEqualTo(String value) {
+        public Criteria andIdNotEqualTo(String value) {
-            addCriterion("user_id <>", value, "userId");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThan(String value) {
+        public Criteria andIdGreaterThan(String value) {
-            addCriterion("user_id >", value, "userId");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("user_id >=", value, "userId");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThan(String value) {
+        public Criteria andIdLessThan(String value) {
-            addCriterion("user_id <", value, "userId");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThanOrEqualTo(String value) {
+        public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("user_id <=", value, "userId");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLike(String value) {
+        public Criteria andIdLike(String value) {
-            addCriterion("user_id like", value, "userId");
+            addCriterion("id like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotLike(String value) {
+        public Criteria andIdNotLike(String value) {
-            addCriterion("user_id not like", value, "userId");
+            addCriterion("id not like", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIn(List<String> values) {
+        public Criteria andIdIn(List<String> values) {
-            addCriterion("user_id in", values, "userId");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotIn(List<String> values) {
+        public Criteria andIdNotIn(List<String> values) {
-            addCriterion("user_id not in", values, "userId");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdBetween(String value1, String value2) {
+        public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("user_id between", value1, value2, "userId");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotBetween(String value1, String value2) {
+        public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("user_id not between", value1, value2, "userId");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 

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

@@ -17,7 +17,7 @@ public class UserRole implements Serializable {
 
     @Schema(title = "组名称", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user_role.name.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{user_role.name.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 255, message = "{user_role.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")
@@ -41,12 +41,12 @@ public class UserRole implements Serializable {
 
     @Schema(title = "创建人(操作人）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user_role.create_user.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{user_role.create_user.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{user_role.create_user.length_range}", groups = {Created.class, Updated.class})
     private String createUser;
 
     @Schema(title = "应用范围", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "{user_role.scope_id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{user_role.scope_id.length_range}", groups = {Created.class, Updated.class})
+    @Size(min = 1, max = 50, message = "{user_role.scope_id.length_range}", groups = {Created.class, Updated.class})
     private String scopeId;
 
     private static final long serialVersionUID = 1L;

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

@@ -10,7 +10,7 @@ public interface MessageTaskBlobMapper {
 
     int deleteByExample(MessageTaskBlobExample example);
 
-    int deleteByPrimaryKey(String messageTaskId);
+    int deleteByPrimaryKey(String id);
 
     int insert(MessageTaskBlob record);
 
@@ -20,7 +20,7 @@ public interface MessageTaskBlobMapper {
 
     List<MessageTaskBlob> selectByExample(MessageTaskBlobExample example);
 
-    MessageTaskBlob selectByPrimaryKey(String messageTaskId);
+    MessageTaskBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") MessageTaskBlob record, @Param("example") MessageTaskBlobExample example);
 

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

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

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

@@ -10,7 +10,7 @@ public interface PluginBlobMapper {
 
     int deleteByExample(PluginBlobExample example);
 
-    int deleteByPrimaryKey(String pluginId);
+    int deleteByPrimaryKey(String id);
 
     int insert(PluginBlob record);
 
@@ -20,7 +20,7 @@ public interface PluginBlobMapper {
 
     List<PluginBlob> selectByExample(PluginBlobExample example);
 
-    PluginBlob selectByPrimaryKey(String pluginId);
+    PluginBlob selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") PluginBlob record, @Param("example") PluginBlobExample example);
 

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

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

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

@@ -10,7 +10,7 @@ public interface UserExtendMapper {
 
     int deleteByExample(UserExtendExample example);
 
-    int deleteByPrimaryKey(String userId);
+    int deleteByPrimaryKey(String id);
 
     int insert(UserExtend record);
 
@@ -20,7 +20,7 @@ public interface UserExtendMapper {
 
     List<UserExtend> selectByExample(UserExtendExample example);
 
-    UserExtend selectByPrimaryKey(String userId);
+    UserExtend selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") UserExtend record, @Param("example") UserExtendExample example);
 

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

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