refactor: 命名优化

backend/app/pom.xml

@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-functional-test</artifactId>
+            <artifactId>metersphere-case-management</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>io.metersphere</groupId>
-            <artifactId>metersphere-issue-management</artifactId>
+            <artifactId>metersphere-bug-management</artifactId>
             <version>${revision}</version>
         </dependency>
     </dependencies>

backend/app/src/main/resources/commons.properties

@@ -70,7 +70,7 @@ jmeter.home=/opt/jmeter
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 # i18n
-spring.messages.basename=i18n/commons,i18n/api,i18n/issue,i18n/load,i18n/project,i18n/system,i18n/plan,i18n/functional,i18n/ui,i18n/workstation
+spring.messages.basename=i18n/commons,i18n/api,i18n/bug,i18n/load,i18n/project,i18n/system,i18n/plan,i18n/case,i18n/ui,i18n/workstation
 # actuator
 management.endpoints.web.exposure.include=*
 management.endpoints.enabled-by-default=false

backend/app/src/main/resources/logback-spring.xml

@@ -269,15 +269,15 @@
         <appender-ref ref="testPlanRefAppender"/>
     </logger>
 
-    <!-- 自定义functional-test模块日志 -->
+    <!-- 自定义case-management模块日志 -->
     <appender name="testTrackAppender"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <File>${logging.file.path}/functional-test.log</File>
+        <File>${logging.file.path}/case-management.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${logging.file.path}/history/functional-test.%d{yyyyMMdd}-%i.log</FileNamePattern>
+            <FileNamePattern>${logging.file.path}/history/case-management.%d{yyyyMMdd}-%i.log</FileNamePattern>
             <maxHistory>${logger.max.history:-30}</maxHistory>
             <maxFileSize>50MB</maxFileSize>
         </rollingPolicy>
@@ -355,15 +355,15 @@
         <appender-ref ref="workstationRefAppender"/>
     </logger>
 
-    <!-- 自定义issue模块日志 -->
-    <appender name="issueAppender"
+    <!-- 自定义bug模块日志 -->
+    <appender name="bugAppender"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
-        <File>${logging.file.path}/issue.log</File>
+        <File>${logging.file.path}/bug.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${logging.file.path}/history/issue.%d{yyyyMMdd}-%i.log</FileNamePattern>
+            <FileNamePattern>${logging.file.path}/history/bug.%d{yyyyMMdd}-%i.log</FileNamePattern>
             <maxHistory>${logger.max.history:-30}</maxHistory>
             <maxFileSize>50MB</maxFileSize>
         </rollingPolicy>
@@ -372,15 +372,15 @@
             <Pattern>%d %t %-5level %logger{36} %line - %msg%n</Pattern>
         </encoder>
     </appender>
-    <appender name="issueRefAppender" class="ch.qos.logback.classic.AsyncAppender">
+    <appender name="bugRefAppender" class="ch.qos.logback.classic.AsyncAppender">
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>INFO</level>
         </filter>
         <queueSize>10000</queueSize>
-        <appender-ref ref="issueAppender"/>
+        <appender-ref ref="bugAppender"/>
     </appender>
-    <logger name="io.metersphere.issue" additivity="false" level="${logger.level:INFO}">
-        <appender-ref ref="issueRefAppender"/>
+    <logger name="io.metersphere.bug" additivity="false" level="${logger.level:INFO}">
+        <appender-ref ref="bugRefAppender"/>
     </logger>
 
     <!-- 自定义API执行过程日志 -->

backend/app/src/main/resources/migration/3.0.0/ddl/V3.0.0_12__bug_ddl.sql

@@ -1,7 +1,8 @@
 -- set innodb lock wait timeout
 SET SESSION innodb_lock_wait_timeout = 7200;
 
-CREATE TABLE IF NOT EXISTS issue(
+DROP TABLE IF EXISTS bug;
+CREATE TABLE IF NOT EXISTS bug(
     `id` VARCHAR(50) NOT NULL   COMMENT 'ID' ,
     `num` INT NOT NULL   COMMENT '业务ID' ,
     `title` VARCHAR(300) NOT NULL   COMMENT '缺陷标题' ,
@@ -14,9 +15,7 @@ CREATE TABLE IF NOT EXISTS issue(
     `platform_status` VARCHAR(50) NOT NULL  DEFAULT '' COMMENT '第三方平台状态' ,
     `platform_id` VARCHAR(50)    COMMENT '第三方平台缺陷ID' ,
     PRIMARY KEY (id)
- )  ENGINE = InnoDB
-    DEFAULT CHARSET = utf8mb4
-    COLLATE = utf8mb4_general_ci COMMENT = '缺陷';
+    )  COMMENT = '缺陷';
 
 
 -- set innodb lock wait timeout to default

backend/framework/domain/pom.xml

@@ -49,7 +49,9 @@
                     <configurationFile>src/main/resources/loadGeneratorConfig.xml</configurationFile>
                     <configurationFile>src/main/resources/sdkGeneratorConfig.xml</configurationFile>
                     <configurationFile>src/main/resources/projectGeneratorConfig.xml</configurationFile>
-                    <configurationFile>src/main/resources/systemGeneratorConfig.xml</configurationFile>
+<!--                    <configurationFile>src/main/resources/systemGeneratorConfig.xml</configurationFile>-->
+<!--                    <configurationFile>src/main/resources/bugGeneratorConfig.xml</configurationFile>-->
+<!--                    <configurationFile>src/main/resources/functionalGeneratorConfig.xml</configurationFile>-->
                 </configuration>
                 <dependencies>
                     <dependency>

backend/framework/domain/src/main/java/io/metersphere/bug/domain/Bug.java

@@ -1,4 +1,4 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,19 +7,19 @@ import java.io.Serializable;
 import lombok.Data;
 
 @Data
-public class Issue implements Serializable {
+public class Bug implements Serializable {
     @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 50, message = "{issue.id.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{bug.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
     @Schema(title = "业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{issue.num.not_blank}", groups = {Created.class})
+    @NotNull(message = "{bug.num.not_blank}", groups = {Created.class})
     private Integer num;
 
     @Schema(title = "缺陷标题", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue.title.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 300, message = "{issue.title.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug.title.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 300, message = "{bug.title.length_range}", groups = {Created.class, Updated.class})
     private String title;
 
     @Schema(title = "创建时间")
@@ -29,13 +29,13 @@ public class Issue implements Serializable {
     private Long updateTime;
 
     @Schema(title = "缺陷平台", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue.platform.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue.platform.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug.platform.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug.platform.length_range}", groups = {Created.class, Updated.class})
     private String platform;
 
     @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue.project_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue.project_id.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug.project_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug.project_id.length_range}", groups = {Created.class, Updated.class})
     private String projectId;
 
     @Schema(title = "创建人")
@@ -45,8 +45,8 @@ public class Issue implements Serializable {
     private String sourceId;
 
     @Schema(title = "第三方平台状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue.platform_status.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue.platform_status.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug.platform_status.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug.platform_status.length_range}", groups = {Created.class, Updated.class})
     private String platformStatus;
 
     @Schema(title = "第三方平台缺陷ID")

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugAttachment.java

@@ -1,4 +1,4 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,16 +7,16 @@ import java.io.Serializable;
 import lombok.Data;
 
 @Data
-public class IssueFollow implements Serializable {
+public class BugAttachment implements Serializable {
     @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_follow.issue_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue_follow.issue_id.length_range}", groups = {Created.class, Updated.class})
-    private String issueId;
+    @NotBlank(message = "{bug_attachment.bug_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_attachment.bug_id.length_range}", groups = {Created.class, Updated.class})
+    private String bugId;
 
-    @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_follow.follow_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
-    private String followId;
+    @Schema(title = "文件的ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_attachment.file_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_attachment.file_id.length_range}", groups = {Created.class, Updated.class})
+    private String fileId;
 
     private static final long serialVersionUID = 1L;
 }

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugAttachmentExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueAttachmentExample {
+public class BugAttachmentExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueAttachmentExample() {
+    public BugAttachmentExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -104,73 +104,73 @@ public class IssueAttachmentExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andIssueIdIsNull() {
-            addCriterion("issue_id is null");
+        public Criteria andBugIdIsNull() {
+            addCriterion("bug_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIsNotNull() {
-            addCriterion("issue_id is not null");
+        public Criteria andBugIdIsNotNull() {
+            addCriterion("bug_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdEqualTo(String value) {
-            addCriterion("issue_id =", value, "issueId");
+        public Criteria andBugIdEqualTo(String value) {
+            addCriterion("bug_id =", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotEqualTo(String value) {
-            addCriterion("issue_id <>", value, "issueId");
+        public Criteria andBugIdNotEqualTo(String value) {
+            addCriterion("bug_id <>", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThan(String value) {
-            addCriterion("issue_id >", value, "issueId");
+        public Criteria andBugIdGreaterThan(String value) {
+            addCriterion("bug_id >", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThanOrEqualTo(String value) {
-            addCriterion("issue_id >=", value, "issueId");
+        public Criteria andBugIdGreaterThanOrEqualTo(String value) {
+            addCriterion("bug_id >=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThan(String value) {
-            addCriterion("issue_id <", value, "issueId");
+        public Criteria andBugIdLessThan(String value) {
+            addCriterion("bug_id <", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThanOrEqualTo(String value) {
-            addCriterion("issue_id <=", value, "issueId");
+        public Criteria andBugIdLessThanOrEqualTo(String value) {
+            addCriterion("bug_id <=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLike(String value) {
-            addCriterion("issue_id like", value, "issueId");
+        public Criteria andBugIdLike(String value) {
+            addCriterion("bug_id like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotLike(String value) {
-            addCriterion("issue_id not like", value, "issueId");
+        public Criteria andBugIdNotLike(String value) {
+            addCriterion("bug_id not like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIn(List<String> values) {
-            addCriterion("issue_id in", values, "issueId");
+        public Criteria andBugIdIn(List<String> values) {
+            addCriterion("bug_id in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotIn(List<String> values) {
-            addCriterion("issue_id not in", values, "issueId");
+        public Criteria andBugIdNotIn(List<String> values) {
+            addCriterion("bug_id not in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdBetween(String value1, String value2) {
-            addCriterion("issue_id between", value1, value2, "issueId");
+        public Criteria andBugIdBetween(String value1, String value2) {
+            addCriterion("bug_id between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotBetween(String value1, String value2) {
-            addCriterion("issue_id not between", value1, value2, "issueId");
+        public Criteria andBugIdNotBetween(String value1, String value2) {
+            addCriterion("bug_id not between", value1, value2, "bugId");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugBlob.java

@@ -1,4 +1,4 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,10 +7,10 @@ import java.io.Serializable;
 import lombok.Data;
 
 @Data
-public class IssueBlob implements Serializable {
+public class BugBlob implements Serializable {
     @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_blob.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 50, message = "{issue_blob.id.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug_blob.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{bug_blob.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
     @Schema(title = "缺陷描述")

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugBlobExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueBlobExample {
+public class BugBlobExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueBlobExample() {
+    public BugBlobExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugComment.java

@@ -0,0 +1,36 @@
+package io.metersphere.bug.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class BugComment implements Serializable {
+    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_comment.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 64, message = "{bug_comment.id.length_range}", groups = {Created.class, Updated.class})
+    private String id;
+
+    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_comment.bug_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 64, message = "{bug_comment.bug_id.length_range}", groups = {Created.class, Updated.class})
+    private String bugId;
+
+    @Schema(title = "评论人")
+    private String createUser;
+
+    @Schema(title = "创建时间")
+    private Long createTime;
+
+    @Schema(title = "更新时间")
+    private Long updateTime;
+
+    @Schema(title = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_comment.description.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 65535, message = "{bug_comment.description.length_range}", groups = {Created.class, Updated.class})
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugCommentExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueCommentExample {
+public class BugCommentExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueCommentExample() {
+    public BugCommentExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -174,73 +174,73 @@ public class IssueCommentExample {
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIsNull() {
-            addCriterion("issue_id is null");
+        public Criteria andBugIdIsNull() {
+            addCriterion("bug_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIsNotNull() {
-            addCriterion("issue_id is not null");
+        public Criteria andBugIdIsNotNull() {
+            addCriterion("bug_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdEqualTo(String value) {
-            addCriterion("issue_id =", value, "issueId");
+        public Criteria andBugIdEqualTo(String value) {
+            addCriterion("bug_id =", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotEqualTo(String value) {
-            addCriterion("issue_id <>", value, "issueId");
+        public Criteria andBugIdNotEqualTo(String value) {
+            addCriterion("bug_id <>", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThan(String value) {
-            addCriterion("issue_id >", value, "issueId");
+        public Criteria andBugIdGreaterThan(String value) {
+            addCriterion("bug_id >", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThanOrEqualTo(String value) {
-            addCriterion("issue_id >=", value, "issueId");
+        public Criteria andBugIdGreaterThanOrEqualTo(String value) {
+            addCriterion("bug_id >=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThan(String value) {
-            addCriterion("issue_id <", value, "issueId");
+        public Criteria andBugIdLessThan(String value) {
+            addCriterion("bug_id <", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThanOrEqualTo(String value) {
-            addCriterion("issue_id <=", value, "issueId");
+        public Criteria andBugIdLessThanOrEqualTo(String value) {
+            addCriterion("bug_id <=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLike(String value) {
-            addCriterion("issue_id like", value, "issueId");
+        public Criteria andBugIdLike(String value) {
+            addCriterion("bug_id like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotLike(String value) {
-            addCriterion("issue_id not like", value, "issueId");
+        public Criteria andBugIdNotLike(String value) {
+            addCriterion("bug_id not like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIn(List<String> values) {
-            addCriterion("issue_id in", values, "issueId");
+        public Criteria andBugIdIn(List<String> values) {
+            addCriterion("bug_id in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotIn(List<String> values) {
-            addCriterion("issue_id not in", values, "issueId");
+        public Criteria andBugIdNotIn(List<String> values) {
+            addCriterion("bug_id not in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdBetween(String value1, String value2) {
-            addCriterion("issue_id between", value1, value2, "issueId");
+        public Criteria andBugIdBetween(String value1, String value2) {
+            addCriterion("bug_id between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotBetween(String value1, String value2) {
-            addCriterion("issue_id not between", value1, value2, "issueId");
+        public Criteria andBugIdNotBetween(String value1, String value2) {
+            addCriterion("bug_id not between", value1, value2, "bugId");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugCustomField.java

@@ -0,0 +1,28 @@
+package io.metersphere.bug.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class BugCustomField implements Serializable {
+    @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_custom_field.bug_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_custom_field.bug_id.length_range}", groups = {Created.class, Updated.class})
+    private String bugId;
+
+    @Schema(title = "字段ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_custom_field.field_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_custom_field.field_id.length_range}", groups = {Created.class, Updated.class})
+    private String fieldId;
+
+    @Schema(title = "字段值")
+    private String value;
+
+    @Schema(title = "文本类型字段值")
+    private byte[] textValue;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugCustomFieldExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class CustomFieldIssuesExample {
+public class BugCustomFieldExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public CustomFieldIssuesExample() {
+    public BugCustomFieldExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -104,73 +104,73 @@ public class CustomFieldIssuesExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andResourceIdIsNull() {
-            addCriterion("resource_id is null");
+        public Criteria andBugIdIsNull() {
+            addCriterion("bug_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdIsNotNull() {
-            addCriterion("resource_id is not null");
+        public Criteria andBugIdIsNotNull() {
+            addCriterion("bug_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdEqualTo(String value) {
-            addCriterion("resource_id =", value, "resourceId");
+        public Criteria andBugIdEqualTo(String value) {
+            addCriterion("bug_id =", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotEqualTo(String value) {
-            addCriterion("resource_id <>", value, "resourceId");
+        public Criteria andBugIdNotEqualTo(String value) {
+            addCriterion("bug_id <>", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdGreaterThan(String value) {
-            addCriterion("resource_id >", value, "resourceId");
+        public Criteria andBugIdGreaterThan(String value) {
+            addCriterion("bug_id >", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdGreaterThanOrEqualTo(String value) {
-            addCriterion("resource_id >=", value, "resourceId");
+        public Criteria andBugIdGreaterThanOrEqualTo(String value) {
+            addCriterion("bug_id >=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLessThan(String value) {
-            addCriterion("resource_id <", value, "resourceId");
+        public Criteria andBugIdLessThan(String value) {
+            addCriterion("bug_id <", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLessThanOrEqualTo(String value) {
-            addCriterion("resource_id <=", value, "resourceId");
+        public Criteria andBugIdLessThanOrEqualTo(String value) {
+            addCriterion("bug_id <=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLike(String value) {
-            addCriterion("resource_id like", value, "resourceId");
+        public Criteria andBugIdLike(String value) {
+            addCriterion("bug_id like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotLike(String value) {
-            addCriterion("resource_id not like", value, "resourceId");
+        public Criteria andBugIdNotLike(String value) {
+            addCriterion("bug_id not like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdIn(List<String> values) {
-            addCriterion("resource_id in", values, "resourceId");
+        public Criteria andBugIdIn(List<String> values) {
+            addCriterion("bug_id in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotIn(List<String> values) {
-            addCriterion("resource_id not in", values, "resourceId");
+        public Criteria andBugIdNotIn(List<String> values) {
+            addCriterion("bug_id not in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdBetween(String value1, String value2) {
-            addCriterion("resource_id between", value1, value2, "resourceId");
+        public Criteria andBugIdBetween(String value1, String value2) {
+            addCriterion("bug_id between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotBetween(String value1, String value2) {
-            addCriterion("resource_id not between", value1, value2, "resourceId");
+        public Criteria andBugIdNotBetween(String value1, String value2) {
+            addCriterion("bug_id not between", value1, value2, "bugId");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueExample {
+public class BugExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueExample() {
+    public BugExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugFollower.java

@@ -0,0 +1,22 @@
+package io.metersphere.bug.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class BugFollower implements Serializable {
+    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_follower.bug_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_follower.bug_id.length_range}", groups = {Created.class, Updated.class})
+    private String bugId;
+
+    @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_follower.user_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_follower.user_id.length_range}", groups = {Created.class, Updated.class})
+    private String userId;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugFollowerExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueFollowExample {
+public class BugFollowerExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueFollowExample() {
+    public BugFollowerExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -104,143 +104,143 @@ public class IssueFollowExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andIssueIdIsNull() {
-            addCriterion("issue_id is null");
+        public Criteria andBugIdIsNull() {
+            addCriterion("bug_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIsNotNull() {
-            addCriterion("issue_id is not null");
+        public Criteria andBugIdIsNotNull() {
+            addCriterion("bug_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdEqualTo(String value) {
-            addCriterion("issue_id =", value, "issueId");
+        public Criteria andBugIdEqualTo(String value) {
+            addCriterion("bug_id =", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotEqualTo(String value) {
-            addCriterion("issue_id <>", value, "issueId");
+        public Criteria andBugIdNotEqualTo(String value) {
+            addCriterion("bug_id <>", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThan(String value) {
-            addCriterion("issue_id >", value, "issueId");
+        public Criteria andBugIdGreaterThan(String value) {
+            addCriterion("bug_id >", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdGreaterThanOrEqualTo(String value) {
-            addCriterion("issue_id >=", value, "issueId");
+        public Criteria andBugIdGreaterThanOrEqualTo(String value) {
+            addCriterion("bug_id >=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThan(String value) {
-            addCriterion("issue_id <", value, "issueId");
+        public Criteria andBugIdLessThan(String value) {
+            addCriterion("bug_id <", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLessThanOrEqualTo(String value) {
-            addCriterion("issue_id <=", value, "issueId");
+        public Criteria andBugIdLessThanOrEqualTo(String value) {
+            addCriterion("bug_id <=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdLike(String value) {
-            addCriterion("issue_id like", value, "issueId");
+        public Criteria andBugIdLike(String value) {
+            addCriterion("bug_id like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotLike(String value) {
-            addCriterion("issue_id not like", value, "issueId");
+        public Criteria andBugIdNotLike(String value) {
+            addCriterion("bug_id not like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdIn(List<String> values) {
-            addCriterion("issue_id in", values, "issueId");
+        public Criteria andBugIdIn(List<String> values) {
+            addCriterion("bug_id in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotIn(List<String> values) {
-            addCriterion("issue_id not in", values, "issueId");
+        public Criteria andBugIdNotIn(List<String> values) {
+            addCriterion("bug_id not in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdBetween(String value1, String value2) {
-            addCriterion("issue_id between", value1, value2, "issueId");
+        public Criteria andBugIdBetween(String value1, String value2) {
+            addCriterion("bug_id between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssueIdNotBetween(String value1, String value2) {
-            addCriterion("issue_id not between", value1, value2, "issueId");
+        public Criteria andBugIdNotBetween(String value1, String value2) {
+            addCriterion("bug_id not between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNull() {
-            addCriterion("follow_id is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNotNull() {
-            addCriterion("follow_id is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdEqualTo(String value) {
-            addCriterion("follow_id =", value, "followId");
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotEqualTo(String value) {
-            addCriterion("follow_id <>", value, "followId");
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThan(String value) {
-            addCriterion("follow_id >", value, "followId");
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
-            addCriterion("follow_id >=", value, "followId");
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThan(String value) {
-            addCriterion("follow_id <", value, "followId");
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThanOrEqualTo(String value) {
-            addCriterion("follow_id <=", value, "followId");
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLike(String value) {
-            addCriterion("follow_id like", value, "followId");
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotLike(String value) {
-            addCriterion("follow_id not like", value, "followId");
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIn(List<String> values) {
-            addCriterion("follow_id in", values, "followId");
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotIn(List<String> values) {
-            addCriterion("follow_id not in", values, "followId");
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdBetween(String value1, String value2) {
-            addCriterion("follow_id between", value1, value2, "followId");
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotBetween(String value1, String value2) {
-            addCriterion("follow_id not between", value1, value2, "followId");
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugFunctionalCase.java

@@ -0,0 +1,43 @@
+package io.metersphere.bug.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class BugFunctionalCase implements Serializable {
+    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_functional_case.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{bug_functional_case.id.length_range}", groups = {Created.class, Updated.class})
+    private String id;
+
+    @Schema(title = "功能用例或测试计划功能用例ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_functional_case.resource_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_functional_case.resource_id.length_range}", groups = {Created.class, Updated.class})
+    private String resourceId;
+
+    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_functional_case.bug_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_functional_case.bug_id.length_range}", groups = {Created.class, Updated.class})
+    private String bugId;
+
+    @Schema(title = "关联的类型：关联功能用例/关联测试计划功能用例", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_functional_case.ref_type.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 64, message = "{bug_functional_case.ref_type.length_range}", groups = {Created.class, Updated.class})
+    private String refType;
+
+    @Schema(title = "测试计划的用例所指向的用例的id", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{bug_functional_case.ref_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_functional_case.ref_id.length_range}", groups = {Created.class, Updated.class})
+    private String refId;
+
+    @Schema(title = "创建时间")
+    private Long createTime;
+
+    @Schema(title = "更新时间")
+    private Long updateTime;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/bug/domain/BugFunctionalCaseExample.java

@@ -1,16 +1,16 @@
-package io.metersphere.issue.domain;
+package io.metersphere.bug.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssuesFunctionalCaseExample {
+public class BugFunctionalCaseExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssuesFunctionalCaseExample() {
+    public BugFunctionalCaseExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -244,73 +244,73 @@ public class IssuesFunctionalCaseExample {
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdIsNull() {
-            addCriterion("issues_id is null");
+        public Criteria andBugIdIsNull() {
+            addCriterion("bug_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdIsNotNull() {
-            addCriterion("issues_id is not null");
+        public Criteria andBugIdIsNotNull() {
+            addCriterion("bug_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdEqualTo(String value) {
-            addCriterion("issues_id =", value, "issuesId");
+        public Criteria andBugIdEqualTo(String value) {
+            addCriterion("bug_id =", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdNotEqualTo(String value) {
-            addCriterion("issues_id <>", value, "issuesId");
+        public Criteria andBugIdNotEqualTo(String value) {
+            addCriterion("bug_id <>", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdGreaterThan(String value) {
-            addCriterion("issues_id >", value, "issuesId");
+        public Criteria andBugIdGreaterThan(String value) {
+            addCriterion("bug_id >", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdGreaterThanOrEqualTo(String value) {
-            addCriterion("issues_id >=", value, "issuesId");
+        public Criteria andBugIdGreaterThanOrEqualTo(String value) {
+            addCriterion("bug_id >=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdLessThan(String value) {
-            addCriterion("issues_id <", value, "issuesId");
+        public Criteria andBugIdLessThan(String value) {
+            addCriterion("bug_id <", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdLessThanOrEqualTo(String value) {
-            addCriterion("issues_id <=", value, "issuesId");
+        public Criteria andBugIdLessThanOrEqualTo(String value) {
+            addCriterion("bug_id <=", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdLike(String value) {
-            addCriterion("issues_id like", value, "issuesId");
+        public Criteria andBugIdLike(String value) {
+            addCriterion("bug_id like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdNotLike(String value) {
-            addCriterion("issues_id not like", value, "issuesId");
+        public Criteria andBugIdNotLike(String value) {
+            addCriterion("bug_id not like", value, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdIn(List<String> values) {
-            addCriterion("issues_id in", values, "issuesId");
+        public Criteria andBugIdIn(List<String> values) {
+            addCriterion("bug_id in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdNotIn(List<String> values) {
-            addCriterion("issues_id not in", values, "issuesId");
+        public Criteria andBugIdNotIn(List<String> values) {
+            addCriterion("bug_id not in", values, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdBetween(String value1, String value2) {
-            addCriterion("issues_id between", value1, value2, "issuesId");
+        public Criteria andBugIdBetween(String value1, String value2) {
+            addCriterion("bug_id between", value1, value2, "bugId");
             return (Criteria) this;
         }
 
-        public Criteria andIssuesIdNotBetween(String value1, String value2) {
-            addCriterion("issues_id not between", value1, value2, "issuesId");
+        public Criteria andBugIdNotBetween(String value1, String value2) {
+            addCriterion("bug_id not between", value1, value2, "bugId");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugAttachmentMapper.java

@@ -0,0 +1,24 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugAttachment;
+import io.metersphere.bug.domain.BugAttachmentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugAttachmentMapper {
+    long countByExample(BugAttachmentExample example);
+
+    int deleteByExample(BugAttachmentExample example);
+
+    int deleteByPrimaryKey(@Param("bugId") String bugId, @Param("fileId") String fileId);
+
+    int insert(BugAttachment record);
+
+    int insertSelective(BugAttachment record);
+
+    List<BugAttachment> selectByExample(BugAttachmentExample example);
+
+    int updateByExampleSelective(@Param("record") BugAttachment record, @Param("example") BugAttachmentExample example);
+
+    int updateByExample(@Param("record") BugAttachment record, @Param("example") BugAttachmentExample example);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugAttachmentMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssueAttachmentMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.IssueAttachment">
-    <id column="issue_id" jdbcType="VARCHAR" property="issueId" />
+<mapper namespace="io.metersphere.bug.mapper.BugAttachmentMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugAttachment">
+    <id column="bug_id" jdbcType="VARCHAR" property="bugId" />
     <id column="file_id" jdbcType="VARCHAR" property="fileId" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -64,15 +64,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    issue_id, file_id
+    bug_id, file_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssueAttachmentExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugAttachmentExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_attachment
+    from bug_attachment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -81,50 +81,50 @@
     </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from issue_attachment
-    where issue_id = #{issueId,jdbcType=VARCHAR}
+    delete from bug_attachment
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and file_id = #{fileId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssueAttachmentExample">
-    delete from issue_attachment
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugAttachmentExample">
+    delete from bug_attachment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.IssueAttachment">
-    insert into issue_attachment (issue_id, file_id)
-    values (#{issueId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR})
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugAttachment">
+    insert into bug_attachment (bug_id, file_id)
+    values (#{bugId,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.IssueAttachment">
-    insert into issue_attachment
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugAttachment">
+    insert into bug_attachment
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="issueId != null">
-        issue_id,
+      <if test="bugId != null">
+        bug_id,
       </if>
       <if test="fileId != null">
         file_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="issueId != null">
-        #{issueId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="fileId != null">
         #{fileId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssueAttachmentExample" resultType="java.lang.Long">
-    select count(*) from issue_attachment
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugAttachmentExample" resultType="java.lang.Long">
+    select count(*) from bug_attachment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_attachment
+    update bug_attachment
     <set>
-      <if test="record.issueId != null">
-        issue_id = #{record.issueId,jdbcType=VARCHAR},
+      <if test="record.bugId != null">
+        bug_id = #{record.bugId,jdbcType=VARCHAR},
       </if>
       <if test="record.fileId != null">
         file_id = #{record.fileId,jdbcType=VARCHAR},
@@ -135,8 +135,8 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_attachment
-    set issue_id = #{record.issueId,jdbcType=VARCHAR},
+    update bug_attachment
+    set bug_id = #{record.bugId,jdbcType=VARCHAR},
       file_id = #{record.fileId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugBlobMapper.java

@@ -0,0 +1,34 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugBlob;
+import io.metersphere.bug.domain.BugBlobExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugBlobMapper {
+    long countByExample(BugBlobExample example);
+
+    int deleteByExample(BugBlobExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BugBlob record);
+
+    int insertSelective(BugBlob record);
+
+    List<BugBlob> selectByExampleWithBLOBs(BugBlobExample example);
+
+    List<BugBlob> selectByExample(BugBlobExample example);
+
+    BugBlob selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BugBlob record, @Param("example") BugBlobExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") BugBlob record, @Param("example") BugBlobExample example);
+
+    int updateByExample(@Param("record") BugBlob record, @Param("example") BugBlobExample example);
+
+    int updateByPrimaryKeySelective(BugBlob record);
+
+    int updateByPrimaryKeyWithBLOBs(BugBlob record);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugBlobMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssueBlobMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.IssueBlob">
+<mapper namespace="io.metersphere.bug.mapper.BugBlobMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugBlob">
     <id column="id" jdbcType="VARCHAR" property="id" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.issue.domain.IssueBlob">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.bug.domain.BugBlob">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -71,7 +71,7 @@
   <sql id="Blob_Column_List">
     description
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.issue.domain.IssueBlobExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.bug.domain.BugBlobExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -79,7 +79,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_blob
+    from bug_blob
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -87,13 +87,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssueBlobExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugBlobExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_blob
+    from bug_blob
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -106,25 +106,25 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_blob
+    from bug_blob
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issue_blob
+    delete from bug_blob
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssueBlobExample">
-    delete from issue_blob
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugBlobExample">
+    delete from bug_blob
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.IssueBlob">
-    insert into issue_blob (id, description)
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugBlob">
+    insert into bug_blob (id, description)
     values (#{id,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.IssueBlob">
-    insert into issue_blob
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugBlob">
+    insert into bug_blob
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -142,14 +142,14 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssueBlobExample" resultType="java.lang.Long">
-    select count(*) from issue_blob
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugBlobExample" resultType="java.lang.Long">
+    select count(*) from bug_blob
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_blob
+    update bug_blob
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -163,7 +163,7 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update issue_blob
+    update bug_blob
     set id = #{record.id,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -171,14 +171,14 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_blob
+    update bug_blob
     set id = #{record.id,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.issue.domain.IssueBlob">
-    update issue_blob
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.bug.domain.BugBlob">
+    update bug_blob
     <set>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
@@ -186,8 +186,8 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.issue.domain.IssueBlob">
-    update issue_blob
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.bug.domain.BugBlob">
+    update bug_blob
     set description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugCommentMapper.java

@@ -0,0 +1,36 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugComment;
+import io.metersphere.bug.domain.BugCommentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugCommentMapper {
+    long countByExample(BugCommentExample example);
+
+    int deleteByExample(BugCommentExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BugComment record);
+
+    int insertSelective(BugComment record);
+
+    List<BugComment> selectByExampleWithBLOBs(BugCommentExample example);
+
+    List<BugComment> selectByExample(BugCommentExample example);
+
+    BugComment selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BugComment record, @Param("example") BugCommentExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") BugComment record, @Param("example") BugCommentExample example);
+
+    int updateByExample(@Param("record") BugComment record, @Param("example") BugCommentExample example);
+
+    int updateByPrimaryKeySelective(BugComment record);
+
+    int updateByPrimaryKeyWithBLOBs(BugComment record);
+
+    int updateByPrimaryKey(BugComment record);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugCommentMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssueCommentMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.IssueComment">
+<mapper namespace="io.metersphere.bug.mapper.BugCommentMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugComment">
     <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="issue_id" jdbcType="VARCHAR" property="issueId" />
+    <result column="bug_id" jdbcType="VARCHAR" property="bugId" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.issue.domain.IssueComment">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.bug.domain.BugComment">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -70,12 +70,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, issue_id, create_user, create_time, update_time
+    id, bug_id, create_user, create_time, update_time
   </sql>
   <sql id="Blob_Column_List">
     description
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.issue.domain.IssueCommentExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.bug.domain.BugCommentExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -83,7 +83,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_comment
+    from bug_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -91,13 +91,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssueCommentExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugCommentExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_comment
+    from bug_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -110,35 +110,35 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_comment
+    from bug_comment
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issue_comment
+    delete from bug_comment
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssueCommentExample">
-    delete from issue_comment
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugCommentExample">
+    delete from bug_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.IssueComment">
-    insert into issue_comment (id, issue_id, create_user, 
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugComment">
+    insert into bug_comment (id, bug_id, create_user, 
       create_time, update_time, description
       )
-    values (#{id,jdbcType=VARCHAR}, #{issueId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{bugId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.IssueComment">
-    insert into issue_comment
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugComment">
+    insert into bug_comment
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="issueId != null">
-        issue_id,
+      <if test="bugId != null">
+        bug_id,
       </if>
       <if test="createUser != null">
         create_user,
@@ -157,8 +157,8 @@
       <if test="id != null">
         #{id,jdbcType=VARCHAR},
       </if>
-      <if test="issueId != null">
-        #{issueId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
@@ -174,20 +174,20 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssueCommentExample" resultType="java.lang.Long">
-    select count(*) from issue_comment
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugCommentExample" resultType="java.lang.Long">
+    select count(*) from bug_comment
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_comment
+    update bug_comment
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
       </if>
-      <if test="record.issueId != null">
-        issue_id = #{record.issueId,jdbcType=VARCHAR},
+      <if test="record.bugId != null">
+        bug_id = #{record.bugId,jdbcType=VARCHAR},
       </if>
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
@@ -207,9 +207,9 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update issue_comment
+    update bug_comment
     set id = #{record.id,jdbcType=VARCHAR},
-      issue_id = #{record.issueId,jdbcType=VARCHAR},
+      bug_id = #{record.bugId,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
@@ -219,9 +219,9 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_comment
+    update bug_comment
     set id = #{record.id,jdbcType=VARCHAR},
-      issue_id = #{record.issueId,jdbcType=VARCHAR},
+      bug_id = #{record.bugId,jdbcType=VARCHAR},
       create_user = #{record.createUser,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT}
@@ -229,11 +229,11 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.issue.domain.IssueComment">
-    update issue_comment
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.bug.domain.BugComment">
+    update bug_comment
     <set>
-      <if test="issueId != null">
-        issue_id = #{issueId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        bug_id = #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
@@ -250,18 +250,18 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.issue.domain.IssueComment">
-    update issue_comment
-    set issue_id = #{issueId,jdbcType=VARCHAR},
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.bug.domain.BugComment">
+    update bug_comment
+    set bug_id = #{bugId,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.issue.domain.IssueComment">
-    update issue_comment
-    set issue_id = #{issueId,jdbcType=VARCHAR},
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.bug.domain.BugComment">
+    update bug_comment
+    set bug_id = #{bugId,jdbcType=VARCHAR},
       create_user = #{createUser,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugCustomFieldMapper.java

@@ -0,0 +1,36 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugCustomField;
+import io.metersphere.bug.domain.BugCustomFieldExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugCustomFieldMapper {
+    long countByExample(BugCustomFieldExample example);
+
+    int deleteByExample(BugCustomFieldExample example);
+
+    int deleteByPrimaryKey(@Param("bugId") String bugId, @Param("fieldId") String fieldId);
+
+    int insert(BugCustomField record);
+
+    int insertSelective(BugCustomField record);
+
+    List<BugCustomField> selectByExampleWithBLOBs(BugCustomFieldExample example);
+
+    List<BugCustomField> selectByExample(BugCustomFieldExample example);
+
+    BugCustomField selectByPrimaryKey(@Param("bugId") String bugId, @Param("fieldId") String fieldId);
+
+    int updateByExampleSelective(@Param("record") BugCustomField record, @Param("example") BugCustomFieldExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") BugCustomField record, @Param("example") BugCustomFieldExample example);
+
+    int updateByExample(@Param("record") BugCustomField record, @Param("example") BugCustomFieldExample example);
+
+    int updateByPrimaryKeySelective(BugCustomField record);
+
+    int updateByPrimaryKeyWithBLOBs(BugCustomField record);
+
+    int updateByPrimaryKey(BugCustomField record);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugCustomFieldMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.CustomFieldIssuesMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.CustomFieldIssues">
-    <id column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+<mapper namespace="io.metersphere.bug.mapper.BugCustomFieldMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugCustomField">
+    <id column="bug_id" jdbcType="VARCHAR" property="bugId" />
     <id column="field_id" jdbcType="VARCHAR" property="fieldId" />
     <result column="value" jdbcType="VARCHAR" property="value" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.issue.domain.CustomFieldIssues">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.bug.domain.BugCustomField">
     <result column="text_value" jdbcType="LONGVARBINARY" property="textValue" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -68,12 +68,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    resource_id, field_id, `value`
+    bug_id, field_id, `value`
   </sql>
   <sql id="Blob_Column_List">
     text_value
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.issue.domain.CustomFieldIssuesExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.bug.domain.BugCustomFieldExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -81,7 +81,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from custom_field_issues
+    from bug_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -89,13 +89,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.CustomFieldIssuesExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugCustomFieldExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from custom_field_issues
+    from bug_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -108,32 +108,32 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from custom_field_issues
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    from bug_custom_field
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from custom_field_issues
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    delete from bug_custom_field
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.CustomFieldIssuesExample">
-    delete from custom_field_issues
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugCustomFieldExample">
+    delete from bug_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.CustomFieldIssues">
-    insert into custom_field_issues (resource_id, field_id, `value`, 
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugCustomField">
+    insert into bug_custom_field (bug_id, field_id, `value`, 
       text_value)
-    values (#{resourceId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
+    values (#{bugId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
       #{textValue,jdbcType=LONGVARBINARY})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.CustomFieldIssues">
-    insert into custom_field_issues
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugCustomField">
+    insert into bug_custom_field
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="resourceId != null">
-        resource_id,
+      <if test="bugId != null">
+        bug_id,
       </if>
       <if test="fieldId != null">
         field_id,
@@ -146,8 +146,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="resourceId != null">
-        #{resourceId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="fieldId != null">
         #{fieldId,jdbcType=VARCHAR},
@@ -160,17 +160,17 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.CustomFieldIssuesExample" resultType="java.lang.Long">
-    select count(*) from custom_field_issues
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugCustomFieldExample" resultType="java.lang.Long">
+    select count(*) from bug_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update custom_field_issues
+    update bug_custom_field
     <set>
-      <if test="record.resourceId != null">
-        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      <if test="record.bugId != null">
+        bug_id = #{record.bugId,jdbcType=VARCHAR},
       </if>
       <if test="record.fieldId != null">
         field_id = #{record.fieldId,jdbcType=VARCHAR},
@@ -187,8 +187,8 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update custom_field_issues
-    set resource_id = #{record.resourceId,jdbcType=VARCHAR},
+    update bug_custom_field
+    set bug_id = #{record.bugId,jdbcType=VARCHAR},
       field_id = #{record.fieldId,jdbcType=VARCHAR},
       `value` = #{record.value,jdbcType=VARCHAR},
       text_value = #{record.textValue,jdbcType=LONGVARBINARY}
@@ -197,16 +197,16 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update custom_field_issues
-    set resource_id = #{record.resourceId,jdbcType=VARCHAR},
+    update bug_custom_field
+    set bug_id = #{record.bugId,jdbcType=VARCHAR},
       field_id = #{record.fieldId,jdbcType=VARCHAR},
       `value` = #{record.value,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.issue.domain.CustomFieldIssues">
-    update custom_field_issues
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.bug.domain.BugCustomField">
+    update bug_custom_field
     <set>
       <if test="value != null">
         `value` = #{value,jdbcType=VARCHAR},
@@ -215,20 +215,20 @@
         text_value = #{textValue,jdbcType=LONGVARBINARY},
       </if>
     </set>
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.issue.domain.CustomFieldIssues">
-    update custom_field_issues
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.bug.domain.BugCustomField">
+    update bug_custom_field
     set `value` = #{value,jdbcType=VARCHAR},
       text_value = #{textValue,jdbcType=LONGVARBINARY}
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.issue.domain.CustomFieldIssues">
-    update custom_field_issues
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.bug.domain.BugCustomField">
+    update bug_custom_field
     set `value` = #{value,jdbcType=VARCHAR}
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where bug_id = #{bugId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugFollowerMapper.java

@@ -0,0 +1,24 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugFollower;
+import io.metersphere.bug.domain.BugFollowerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugFollowerMapper {
+    long countByExample(BugFollowerExample example);
+
+    int deleteByExample(BugFollowerExample example);
+
+    int deleteByPrimaryKey(@Param("bugId") String bugId, @Param("userId") String userId);
+
+    int insert(BugFollower record);
+
+    int insertSelective(BugFollower record);
+
+    List<BugFollower> selectByExample(BugFollowerExample example);
+
+    int updateByExampleSelective(@Param("record") BugFollower record, @Param("example") BugFollowerExample example);
+
+    int updateByExample(@Param("record") BugFollower record, @Param("example") BugFollowerExample example);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugFollowerMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssueFollowMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.IssueFollow">
-    <id column="issue_id" jdbcType="VARCHAR" property="issueId" />
-    <id column="follow_id" jdbcType="VARCHAR" property="followId" />
+<mapper namespace="io.metersphere.bug.mapper.BugFollowerMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugFollower">
+    <id column="bug_id" jdbcType="VARCHAR" property="bugId" />
+    <id column="user_id" jdbcType="VARCHAR" property="userId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -64,15 +64,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    issue_id, follow_id
+    bug_id, user_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssueFollowExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugFollowerExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_follow
+    from bug_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -81,53 +81,53 @@
     </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from issue_follow
-    where issue_id = #{issueId,jdbcType=VARCHAR}
-      and follow_id = #{followId,jdbcType=VARCHAR}
+    delete from bug_follower
+    where bug_id = #{bugId,jdbcType=VARCHAR}
+      and user_id = #{userId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssueFollowExample">
-    delete from issue_follow
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugFollowerExample">
+    delete from bug_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.IssueFollow">
-    insert into issue_follow (issue_id, follow_id)
-    values (#{issueId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugFollower">
+    insert into bug_follower (bug_id, user_id)
+    values (#{bugId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.IssueFollow">
-    insert into issue_follow
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugFollower">
+    insert into bug_follower
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="issueId != null">
-        issue_id,
+      <if test="bugId != null">
+        bug_id,
       </if>
-      <if test="followId != null">
-        follow_id,
+      <if test="userId != null">
+        user_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="issueId != null">
-        #{issueId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        #{bugId,jdbcType=VARCHAR},
       </if>
-      <if test="followId != null">
-        #{followId,jdbcType=VARCHAR},
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssueFollowExample" resultType="java.lang.Long">
-    select count(*) from issue_follow
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugFollowerExample" resultType="java.lang.Long">
+    select count(*) from bug_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_follow
+    update bug_follower
     <set>
-      <if test="record.issueId != null">
-        issue_id = #{record.issueId,jdbcType=VARCHAR},
+      <if test="record.bugId != null">
+        bug_id = #{record.bugId,jdbcType=VARCHAR},
       </if>
-      <if test="record.followId != null">
-        follow_id = #{record.followId,jdbcType=VARCHAR},
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -135,9 +135,9 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_follow
-    set issue_id = #{record.issueId,jdbcType=VARCHAR},
-      follow_id = #{record.followId,jdbcType=VARCHAR}
+    update bug_follower
+    set bug_id = #{record.bugId,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugFunctionalCaseMapper.java

@@ -0,0 +1,30 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.BugFunctionalCase;
+import io.metersphere.bug.domain.BugFunctionalCaseExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugFunctionalCaseMapper {
+    long countByExample(BugFunctionalCaseExample example);
+
+    int deleteByExample(BugFunctionalCaseExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BugFunctionalCase record);
+
+    int insertSelective(BugFunctionalCase record);
+
+    List<BugFunctionalCase> selectByExample(BugFunctionalCaseExample example);
+
+    BugFunctionalCase selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BugFunctionalCase record, @Param("example") BugFunctionalCaseExample example);
+
+    int updateByExample(@Param("record") BugFunctionalCase record, @Param("example") BugFunctionalCaseExample example);
+
+    int updateByPrimaryKeySelective(BugFunctionalCase record);
+
+    int updateByPrimaryKey(BugFunctionalCase record);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugFunctionalCaseMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssuesFunctionalCaseMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.IssuesFunctionalCase">
+<mapper namespace="io.metersphere.bug.mapper.BugFunctionalCaseMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.BugFunctionalCase">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
-    <result column="issues_id" jdbcType="VARCHAR" property="issuesId" />
+    <result column="bug_id" jdbcType="VARCHAR" property="bugId" />
     <result column="ref_type" jdbcType="VARCHAR" property="refType" />
     <result column="ref_id" jdbcType="VARCHAR" property="refId" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
@@ -69,15 +69,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, resource_id, issues_id, ref_type, ref_id, create_time, update_time
+    id, resource_id, bug_id, ref_type, ref_id, create_time, update_time
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssuesFunctionalCaseExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugFunctionalCaseExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issues_functional_case
+    from bug_functional_case
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -88,29 +88,29 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from issues_functional_case
+    from bug_functional_case
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issues_functional_case
+    delete from bug_functional_case
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssuesFunctionalCaseExample">
-    delete from issues_functional_case
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugFunctionalCaseExample">
+    delete from bug_functional_case
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.IssuesFunctionalCase">
-    insert into issues_functional_case (id, resource_id, issues_id, 
+  <insert id="insert" parameterType="io.metersphere.bug.domain.BugFunctionalCase">
+    insert into bug_functional_case (id, resource_id, bug_id, 
       ref_type, ref_id, create_time, 
       update_time)
-    values (#{id,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, #{issuesId,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, #{bugId,jdbcType=VARCHAR}, 
       #{refType,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.IssuesFunctionalCase">
-    insert into issues_functional_case
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.BugFunctionalCase">
+    insert into bug_functional_case
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -118,8 +118,8 @@
       <if test="resourceId != null">
         resource_id,
       </if>
-      <if test="issuesId != null">
-        issues_id,
+      <if test="bugId != null">
+        bug_id,
       </if>
       <if test="refType != null">
         ref_type,
@@ -141,8 +141,8 @@
       <if test="resourceId != null">
         #{resourceId,jdbcType=VARCHAR},
       </if>
-      <if test="issuesId != null">
-        #{issuesId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="refType != null">
         #{refType,jdbcType=VARCHAR},
@@ -158,14 +158,14 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssuesFunctionalCaseExample" resultType="java.lang.Long">
-    select count(*) from issues_functional_case
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugFunctionalCaseExample" resultType="java.lang.Long">
+    select count(*) from bug_functional_case
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issues_functional_case
+    update bug_functional_case
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -173,8 +173,8 @@
       <if test="record.resourceId != null">
         resource_id = #{record.resourceId,jdbcType=VARCHAR},
       </if>
-      <if test="record.issuesId != null">
-        issues_id = #{record.issuesId,jdbcType=VARCHAR},
+      <if test="record.bugId != null">
+        bug_id = #{record.bugId,jdbcType=VARCHAR},
       </if>
       <if test="record.refType != null">
         ref_type = #{record.refType,jdbcType=VARCHAR},
@@ -194,10 +194,10 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issues_functional_case
+    update bug_functional_case
     set id = #{record.id,jdbcType=VARCHAR},
       resource_id = #{record.resourceId,jdbcType=VARCHAR},
-      issues_id = #{record.issuesId,jdbcType=VARCHAR},
+      bug_id = #{record.bugId,jdbcType=VARCHAR},
       ref_type = #{record.refType,jdbcType=VARCHAR},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -206,14 +206,14 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.issue.domain.IssuesFunctionalCase">
-    update issues_functional_case
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.bug.domain.BugFunctionalCase">
+    update bug_functional_case
     <set>
       <if test="resourceId != null">
         resource_id = #{resourceId,jdbcType=VARCHAR},
       </if>
-      <if test="issuesId != null">
-        issues_id = #{issuesId,jdbcType=VARCHAR},
+      <if test="bugId != null">
+        bug_id = #{bugId,jdbcType=VARCHAR},
       </if>
       <if test="refType != null">
         ref_type = #{refType,jdbcType=VARCHAR},
@@ -230,10 +230,10 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.issue.domain.IssuesFunctionalCase">
-    update issues_functional_case
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.bug.domain.BugFunctionalCase">
+    update bug_functional_case
     set resource_id = #{resourceId,jdbcType=VARCHAR},
-      issues_id = #{issuesId,jdbcType=VARCHAR},
+      bug_id = #{bugId,jdbcType=VARCHAR},
       ref_type = #{refType,jdbcType=VARCHAR},
       ref_id = #{refId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.java

@@ -0,0 +1,30 @@
+package io.metersphere.bug.mapper;
+
+import io.metersphere.bug.domain.Bug;
+import io.metersphere.bug.domain.BugExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugMapper {
+    long countByExample(BugExample example);
+
+    int deleteByExample(BugExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(Bug record);
+
+    int insertSelective(Bug record);
+
+    List<Bug> selectByExample(BugExample example);
+
+    Bug selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") Bug record, @Param("example") BugExample example);
+
+    int updateByExample(@Param("record") Bug record, @Param("example") BugExample example);
+
+    int updateByPrimaryKeySelective(Bug record);
+
+    int updateByPrimaryKey(Bug record);
+}

backend/framework/domain/src/main/java/io/metersphere/bug/mapper/BugMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.issue.mapper.IssueMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.issue.domain.Issue">
+<mapper namespace="io.metersphere.bug.mapper.BugMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.bug.domain.Bug">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="num" jdbcType="INTEGER" property="num" />
     <result column="title" jdbcType="VARCHAR" property="title" />
@@ -76,13 +76,13 @@
     id, num, title, create_time, update_time, platform, project_id, create_user, source_id, 
     platform_status, platform_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.issue.domain.IssueExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.bug.domain.BugExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue
+    from bug
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -93,21 +93,21 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from issue
+    from bug
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issue
+    delete from bug
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.issue.domain.IssueExample">
-    delete from issue
+  <delete id="deleteByExample" parameterType="io.metersphere.bug.domain.BugExample">
+    delete from bug
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.issue.domain.Issue">
-    insert into issue (id, num, title, 
+  <insert id="insert" parameterType="io.metersphere.bug.domain.Bug">
+    insert into bug (id, num, title, 
       create_time, update_time, platform, 
       project_id, create_user, source_id, 
       platform_status, platform_id)
@@ -116,8 +116,8 @@
       #{projectId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{sourceId,jdbcType=VARCHAR}, 
       #{platformStatus,jdbcType=VARCHAR}, #{platformId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.issue.domain.Issue">
-    insert into issue
+  <insert id="insertSelective" parameterType="io.metersphere.bug.domain.Bug">
+    insert into bug
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -189,14 +189,14 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.issue.domain.IssueExample" resultType="java.lang.Long">
-    select count(*) from issue
+  <select id="countByExample" parameterType="io.metersphere.bug.domain.BugExample" resultType="java.lang.Long">
+    select count(*) from bug
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue
+    update bug
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -237,7 +237,7 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue
+    update bug
     set id = #{record.id,jdbcType=VARCHAR},
       num = #{record.num,jdbcType=INTEGER},
       title = #{record.title,jdbcType=VARCHAR},
@@ -253,8 +253,8 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.issue.domain.Issue">
-    update issue
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.bug.domain.Bug">
+    update bug
     <set>
       <if test="num != null">
         num = #{num,jdbcType=INTEGER},
@@ -289,8 +289,8 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.issue.domain.Issue">
-    update issue
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.bug.domain.Bug">
+    update bug
     set num = #{num,jdbcType=INTEGER},
       title = #{title,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReview.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 
@@ -32,6 +30,7 @@ public class CaseReview implements Serializable {
     private Long updateTime;
 
     @Schema(title = "评审结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "{case_review.end_time.not_blank}", groups = {Created.class})
     private Long endTime;
 
     @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewFollow.java

@@ -1,24 +0,0 @@
-package io.metersphere.functional.domain;
-
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class CaseReviewFollow implements Serializable {
-    @Schema(title = "评审ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{case_review_follow.review_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{case_review_follow.review_id.length_range}", groups = {Created.class, Updated.class})
-    private String reviewId;
-
-    @Schema(title = "关注人", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{case_review_follow.follow_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{case_review_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
-    private String followId;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewFollower.java

@@ -0,0 +1,22 @@
+package io.metersphere.functional.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CaseReviewFollower implements Serializable {
+    @Schema(title = "评审ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{case_review_follower.review_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{case_review_follower.review_id.length_range}", groups = {Created.class, Updated.class})
+    private String reviewId;
+
+    @Schema(title = "关注人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{case_review_follower.user_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{case_review_follower.user_id.length_range}", groups = {Created.class, Updated.class})
+    private String userId;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewFollowerExample.java

@@ -3,14 +3,14 @@ package io.metersphere.functional.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CaseReviewFollowExample {
+public class CaseReviewFollowerExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public CaseReviewFollowExample() {
+    public CaseReviewFollowerExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -174,73 +174,73 @@ public class CaseReviewFollowExample {
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNull() {
-            addCriterion("follow_id is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNotNull() {
-            addCriterion("follow_id is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdEqualTo(String value) {
-            addCriterion("follow_id =", value, "followId");
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotEqualTo(String value) {
-            addCriterion("follow_id <>", value, "followId");
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThan(String value) {
-            addCriterion("follow_id >", value, "followId");
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
-            addCriterion("follow_id >=", value, "followId");
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThan(String value) {
-            addCriterion("follow_id <", value, "followId");
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThanOrEqualTo(String value) {
-            addCriterion("follow_id <=", value, "followId");
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLike(String value) {
-            addCriterion("follow_id like", value, "followId");
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotLike(String value) {
-            addCriterion("follow_id not like", value, "followId");
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIn(List<String> values) {
-            addCriterion("follow_id in", values, "followId");
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotIn(List<String> values) {
-            addCriterion("follow_id not in", values, "followId");
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdBetween(String value1, String value2) {
-            addCriterion("follow_id between", value1, value2, "followId");
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotBetween(String value1, String value2) {
-            addCriterion("follow_id not between", value1, value2, "followId");
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewFunctionalCase.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 
@@ -40,11 +38,11 @@ public class CaseReviewFunctionalCase implements Serializable {
     private String createUser;
 
     @Schema(title = "自定义排序，间隔5000", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{case_review_functional_case.pos.not_blank}", groups = {Created.class})
+    @NotNull(message = "{case_review_functional_case.pos.not_blank}", groups = {Created.class})
     private Long pos;
 
     @Schema(title = "关联的用例是否放入回收站", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{case_review_functional_case.deleted.not_blank}", groups = {Created.class})
+    @NotNull(message = "{case_review_functional_case.deleted.not_blank}", groups = {Created.class})
     private Boolean deleted;
 
     private static final long serialVersionUID = 1L;

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewFunctionalCaseUser.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CaseReviewUser.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/CustomFieldTestCase.java

@@ -1,30 +0,0 @@
-package io.metersphere.functional.domain;
-
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class CustomFieldTestCase implements Serializable {
-    @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{custom_field_test_case.resource_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{custom_field_test_case.resource_id.length_range}", groups = {Created.class, Updated.class})
-    private String resourceId;
-
-    @Schema(title = "字段ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{custom_field_test_case.field_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{custom_field_test_case.field_id.length_range}", groups = {Created.class, Updated.class})
-    private String fieldId;
-
-    @Schema(title = "字段值")
-    private String value;
-
-    @Schema(title = "")
-    private String textValue;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCase.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 
@@ -16,7 +14,7 @@ public class FunctionalCase implements Serializable {
     private String id;
 
     @Schema(title = "业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case.num.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case.num.not_blank}", groups = {Created.class})
     private Integer num;
 
     @Schema(title = "自定义业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -53,7 +51,7 @@ public class FunctionalCase implements Serializable {
     private String stepModel;
 
     @Schema(title = "自定义排序，间隔5000", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case.pos.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case.pos.not_blank}", groups = {Created.class})
     private Long pos;
 
     @Schema(title = "版本ID", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -72,15 +70,15 @@ public class FunctionalCase implements Serializable {
     private String lastExecuteResult;
 
     @Schema(title = "是否在回收站：0-否，1-是", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case.deleted.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case.deleted.not_blank}", groups = {Created.class})
     private Boolean deleted;
 
     @Schema(title = "是否是公共用例：0-否，1-是", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case.public_case.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case.public_case.not_blank}", groups = {Created.class})
     private Boolean publicCase;
 
     @Schema(title = "是否为最新版本：0-否，1-是", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case.latest.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case.latest.not_blank}", groups = {Created.class})
     private Boolean latest;
 
     @Schema(title = "创建人")

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseAttachment.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseBlob.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseComment.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCustomField.java

@@ -0,0 +1,28 @@
+package io.metersphere.functional.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class FunctionalCaseCustomField implements Serializable {
+    @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_case_custom_field.case_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_case_custom_field.case_id.length_range}", groups = {Created.class, Updated.class})
+    private String caseId;
+
+    @Schema(title = "字段ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_case_custom_field.field_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_case_custom_field.field_id.length_range}", groups = {Created.class, Updated.class})
+    private String fieldId;
+
+    @Schema(title = "字段值")
+    private String value;
+
+    @Schema(title = "")
+    private String textValue;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseCustomFieldExample.java

@@ -3,14 +3,14 @@ package io.metersphere.functional.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CustomFieldTestCaseExample {
+public class FunctionalCaseCustomFieldExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public CustomFieldTestCaseExample() {
+    public FunctionalCaseCustomFieldExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -104,73 +104,73 @@ public class CustomFieldTestCaseExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
-        public Criteria andResourceIdIsNull() {
-            addCriterion("resource_id is null");
+        public Criteria andCaseIdIsNull() {
+            addCriterion("case_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdIsNotNull() {
-            addCriterion("resource_id is not null");
+        public Criteria andCaseIdIsNotNull() {
+            addCriterion("case_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdEqualTo(String value) {
-            addCriterion("resource_id =", value, "resourceId");
+        public Criteria andCaseIdEqualTo(String value) {
+            addCriterion("case_id =", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotEqualTo(String value) {
-            addCriterion("resource_id <>", value, "resourceId");
+        public Criteria andCaseIdNotEqualTo(String value) {
+            addCriterion("case_id <>", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdGreaterThan(String value) {
-            addCriterion("resource_id >", value, "resourceId");
+        public Criteria andCaseIdGreaterThan(String value) {
+            addCriterion("case_id >", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdGreaterThanOrEqualTo(String value) {
-            addCriterion("resource_id >=", value, "resourceId");
+        public Criteria andCaseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("case_id >=", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLessThan(String value) {
-            addCriterion("resource_id <", value, "resourceId");
+        public Criteria andCaseIdLessThan(String value) {
+            addCriterion("case_id <", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLessThanOrEqualTo(String value) {
-            addCriterion("resource_id <=", value, "resourceId");
+        public Criteria andCaseIdLessThanOrEqualTo(String value) {
+            addCriterion("case_id <=", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdLike(String value) {
-            addCriterion("resource_id like", value, "resourceId");
+        public Criteria andCaseIdLike(String value) {
+            addCriterion("case_id like", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotLike(String value) {
-            addCriterion("resource_id not like", value, "resourceId");
+        public Criteria andCaseIdNotLike(String value) {
+            addCriterion("case_id not like", value, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdIn(List<String> values) {
-            addCriterion("resource_id in", values, "resourceId");
+        public Criteria andCaseIdIn(List<String> values) {
+            addCriterion("case_id in", values, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotIn(List<String> values) {
-            addCriterion("resource_id not in", values, "resourceId");
+        public Criteria andCaseIdNotIn(List<String> values) {
+            addCriterion("case_id not in", values, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdBetween(String value1, String value2) {
-            addCriterion("resource_id between", value1, value2, "resourceId");
+        public Criteria andCaseIdBetween(String value1, String value2) {
+            addCriterion("case_id between", value1, value2, "caseId");
             return (Criteria) this;
         }
 
-        public Criteria andResourceIdNotBetween(String value1, String value2) {
-            addCriterion("resource_id not between", value1, value2, "resourceId");
+        public Criteria andCaseIdNotBetween(String value1, String value2) {
+            addCriterion("case_id not between", value1, value2, "caseId");
             return (Criteria) this;
         }
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseFollow.java

@@ -1,24 +0,0 @@
-package io.metersphere.functional.domain;
-
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class FunctionalCaseFollow implements Serializable {
-    @Schema(title = "功能用例ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case_follow.case_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{functional_case_follow.case_id.length_range}", groups = {Created.class, Updated.class})
-    private String caseId;
-
-    @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case_follow.follow_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{functional_case_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
-    private String followId;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseFollower.java

@@ -0,0 +1,22 @@
+package io.metersphere.functional.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class FunctionalCaseFollower implements Serializable {
+    @Schema(title = "功能用例ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_case_follower.case_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_case_follower.case_id.length_range}", groups = {Created.class, Updated.class})
+    private String caseId;
+
+    @Schema(title = "关注人ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_case_follower.user_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_case_follower.user_id.length_range}", groups = {Created.class, Updated.class})
+    private String userId;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseFollowerExample.java

@@ -3,14 +3,14 @@ package io.metersphere.functional.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class FunctionalCaseFollowExample {
+public class FunctionalCaseFollowerExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public FunctionalCaseFollowExample() {
+    public FunctionalCaseFollowerExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -174,73 +174,73 @@ public class FunctionalCaseFollowExample {
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNull() {
-            addCriterion("follow_id is null");
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIsNotNull() {
-            addCriterion("follow_id is not null");
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdEqualTo(String value) {
-            addCriterion("follow_id =", value, "followId");
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotEqualTo(String value) {
-            addCriterion("follow_id <>", value, "followId");
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThan(String value) {
-            addCriterion("follow_id >", value, "followId");
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
-            addCriterion("follow_id >=", value, "followId");
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThan(String value) {
-            addCriterion("follow_id <", value, "followId");
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLessThanOrEqualTo(String value) {
-            addCriterion("follow_id <=", value, "followId");
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdLike(String value) {
-            addCriterion("follow_id like", value, "followId");
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotLike(String value) {
-            addCriterion("follow_id not like", value, "followId");
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdIn(List<String> values) {
-            addCriterion("follow_id in", values, "followId");
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotIn(List<String> values) {
-            addCriterion("follow_id not in", values, "followId");
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdBetween(String value1, String value2) {
-            addCriterion("follow_id between", value1, value2, "followId");
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
             return (Criteria) this;
         }
 
-        public Criteria andFollowIdNotBetween(String value1, String value2) {
-            addCriterion("follow_id not between", value1, value2, "followId");
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseModule.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 
@@ -29,7 +27,7 @@ public class FunctionalCaseModule implements Serializable {
     private String parentId;
 
     @Schema(title = "节点的层级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case_module.level.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case_module.level.not_blank}", groups = {Created.class})
     private Integer level;
 
     @Schema(title = "创建时间")
@@ -39,7 +37,7 @@ public class FunctionalCaseModule implements Serializable {
     private Long updateTime;
 
     @Schema(title = "同一节点下的顺序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{functional_case_module.pos.not_blank}", groups = {Created.class})
+    @NotNull(message = "{functional_case_module.pos.not_blank}", groups = {Created.class})
     private Long pos;
 
     @Schema(title = "创建人")

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseRelationshipEdge.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalCaseTest.java

@@ -1,10 +1,8 @@
 package io.metersphere.functional.domain;
 
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
+import io.metersphere.validation.groups.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import lombok.Data;
 

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalMinderExtraNode.java

@@ -0,0 +1,32 @@
+package io.metersphere.functional.domain;
+
+import io.metersphere.validation.groups.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.*;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class FunctionalMinderExtraNode implements Serializable {
+    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_minder_extra_node.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{functional_minder_extra_node.id.length_range}", groups = {Created.class, Updated.class})
+    private String id;
+
+    @Schema(title = "父节点的ID，即模块ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_minder_extra_node.parent_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_minder_extra_node.parent_id.length_range}", groups = {Created.class, Updated.class})
+    private String parentId;
+
+    @Schema(title = "项目ID，可扩展为其他资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_minder_extra_node.group_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{functional_minder_extra_node.group_id.length_range}", groups = {Created.class, Updated.class})
+    private String groupId;
+
+    @Schema(title = "存储脑图节点额外信息", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "{functional_minder_extra_node.node_data.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 2147483647, message = "{functional_minder_extra_node.node_data.length_range}", groups = {Created.class, Updated.class})
+    private String nodeData;
+
+    private static final long serialVersionUID = 1L;
+}

backend/framework/domain/src/main/java/io/metersphere/functional/domain/FunctionalMinderExtraNodeExample.java

@@ -3,14 +3,14 @@ package io.metersphere.functional.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MinderExtraNodeExample {
+public class FunctionalMinderExtraNodeExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public MinderExtraNodeExample() {
+    public FunctionalMinderExtraNodeExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 
@@ -313,76 +313,6 @@ public class MinderExtraNodeExample {
             addCriterion("group_id not between", value1, value2, "groupId");
             return (Criteria) this;
         }
-
-        public Criteria andTypeIsNull() {
-            addCriterion("`type` is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeIsNotNull() {
-            addCriterion("`type` is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeEqualTo(String value) {
-            addCriterion("`type` =", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotEqualTo(String value) {
-            addCriterion("`type` <>", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeGreaterThan(String value) {
-            addCriterion("`type` >", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeGreaterThanOrEqualTo(String value) {
-            addCriterion("`type` >=", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLessThan(String value) {
-            addCriterion("`type` <", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLessThanOrEqualTo(String value) {
-            addCriterion("`type` <=", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeLike(String value) {
-            addCriterion("`type` like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotLike(String value) {
-            addCriterion("`type` not like", value, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeIn(List<String> values) {
-            addCriterion("`type` in", values, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotIn(List<String> values) {
-            addCriterion("`type` not in", values, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeBetween(String value1, String value2) {
-            addCriterion("`type` between", value1, value2, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotBetween(String value1, String value2) {
-            addCriterion("`type` not between", value1, value2, "type");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/framework/domain/src/main/java/io/metersphere/functional/domain/MinderExtraNode.java

@@ -1,39 +0,0 @@
-package io.metersphere.functional.domain;
-
-import io.metersphere.validation.groups.Created;
-import io.metersphere.validation.groups.Updated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class MinderExtraNode implements Serializable {
-    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{minder_extra_node.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 50, message = "{minder_extra_node.id.length_range}", groups = {Created.class, Updated.class})
-    private String id;
-
-    @Schema(title = "父节点的ID，即模块ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{minder_extra_node.parent_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{minder_extra_node.parent_id.length_range}", groups = {Created.class, Updated.class})
-    private String parentId;
-
-    @Schema(title = "项目ID，可扩展为其他资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{minder_extra_node.group_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{minder_extra_node.group_id.length_range}", groups = {Created.class, Updated.class})
-    private String groupId;
-
-    @Schema(title = "类型，如：用例编辑脑图", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{minder_extra_node.type.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 30, message = "{minder_extra_node.type.length_range}", groups = {Created.class, Updated.class})
-    private String type;
-
-    @Schema(title = "存储脑图节点额外信息", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{minder_extra_node.node_data.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 2147483647, message = "{minder_extra_node.node_data.length_range}", groups = {Created.class, Updated.class})
-    private String nodeData;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/CaseReviewFollowMapper.java

@@ -1,24 +0,0 @@
-package io.metersphere.functional.mapper;
-
-import io.metersphere.functional.domain.CaseReviewFollow;
-import io.metersphere.functional.domain.CaseReviewFollowExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CaseReviewFollowMapper {
-    long countByExample(CaseReviewFollowExample example);
-
-    int deleteByExample(CaseReviewFollowExample example);
-
-    int deleteByPrimaryKey(@Param("reviewId") String reviewId, @Param("followId") String followId);
-
-    int insert(CaseReviewFollow record);
-
-    int insertSelective(CaseReviewFollow record);
-
-    List<CaseReviewFollow> selectByExample(CaseReviewFollowExample example);
-
-    int updateByExampleSelective(@Param("record") CaseReviewFollow record, @Param("example") CaseReviewFollowExample example);
-
-    int updateByExample(@Param("record") CaseReviewFollow record, @Param("example") CaseReviewFollowExample example);
-}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/CaseReviewFollowerMapper.java

@@ -0,0 +1,24 @@
+package io.metersphere.functional.mapper;
+
+import io.metersphere.functional.domain.CaseReviewFollower;
+import io.metersphere.functional.domain.CaseReviewFollowerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CaseReviewFollowerMapper {
+    long countByExample(CaseReviewFollowerExample example);
+
+    int deleteByExample(CaseReviewFollowerExample example);
+
+    int deleteByPrimaryKey(@Param("reviewId") String reviewId, @Param("userId") String userId);
+
+    int insert(CaseReviewFollower record);
+
+    int insertSelective(CaseReviewFollower record);
+
+    List<CaseReviewFollower> selectByExample(CaseReviewFollowerExample example);
+
+    int updateByExampleSelective(@Param("record") CaseReviewFollower record, @Param("example") CaseReviewFollowerExample example);
+
+    int updateByExample(@Param("record") CaseReviewFollower record, @Param("example") CaseReviewFollowerExample example);
+}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/CaseReviewFollowerMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.functional.mapper.CaseReviewFollowMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.CaseReviewFollow">
+<mapper namespace="io.metersphere.functional.mapper.CaseReviewFollowerMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.CaseReviewFollower">
     <id column="review_id" jdbcType="VARCHAR" property="reviewId" />
-    <id column="follow_id" jdbcType="VARCHAR" property="followId" />
+    <id column="user_id" jdbcType="VARCHAR" property="userId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -64,15 +64,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    review_id, follow_id
+    review_id, user_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowerExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from case_review_follow
+    from case_review_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -81,53 +81,53 @@
     </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from case_review_follow
+    delete from case_review_follower
     where review_id = #{reviewId,jdbcType=VARCHAR}
-      and follow_id = #{followId,jdbcType=VARCHAR}
+      and user_id = #{userId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowExample">
-    delete from case_review_follow
+  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowerExample">
+    delete from case_review_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.functional.domain.CaseReviewFollow">
-    insert into case_review_follow (review_id, follow_id)
-    values (#{reviewId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
+  <insert id="insert" parameterType="io.metersphere.functional.domain.CaseReviewFollower">
+    insert into case_review_follower (review_id, user_id)
+    values (#{reviewId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.CaseReviewFollow">
-    insert into case_review_follow
+  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.CaseReviewFollower">
+    insert into case_review_follower
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="reviewId != null">
         review_id,
       </if>
-      <if test="followId != null">
-        follow_id,
+      <if test="userId != null">
+        user_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="reviewId != null">
         #{reviewId,jdbcType=VARCHAR},
       </if>
-      <if test="followId != null">
-        #{followId,jdbcType=VARCHAR},
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowExample" resultType="java.lang.Long">
-    select count(*) from case_review_follow
+  <select id="countByExample" parameterType="io.metersphere.functional.domain.CaseReviewFollowerExample" resultType="java.lang.Long">
+    select count(*) from case_review_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update case_review_follow
+    update case_review_follower
     <set>
       <if test="record.reviewId != null">
         review_id = #{record.reviewId,jdbcType=VARCHAR},
       </if>
-      <if test="record.followId != null">
-        follow_id = #{record.followId,jdbcType=VARCHAR},
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -135,9 +135,9 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update case_review_follow
+    update case_review_follower
     set review_id = #{record.reviewId,jdbcType=VARCHAR},
-      follow_id = #{record.followId,jdbcType=VARCHAR}
+      user_id = #{record.userId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/CustomFieldTestCaseMapper.java

@@ -1,36 +0,0 @@
-package io.metersphere.functional.mapper;
-
-import io.metersphere.functional.domain.CustomFieldTestCase;
-import io.metersphere.functional.domain.CustomFieldTestCaseExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CustomFieldTestCaseMapper {
-    long countByExample(CustomFieldTestCaseExample example);
-
-    int deleteByExample(CustomFieldTestCaseExample example);
-
-    int deleteByPrimaryKey(@Param("resourceId") String resourceId, @Param("fieldId") String fieldId);
-
-    int insert(CustomFieldTestCase record);
-
-    int insertSelective(CustomFieldTestCase record);
-
-    List<CustomFieldTestCase> selectByExampleWithBLOBs(CustomFieldTestCaseExample example);
-
-    List<CustomFieldTestCase> selectByExample(CustomFieldTestCaseExample example);
-
-    CustomFieldTestCase selectByPrimaryKey(@Param("resourceId") String resourceId, @Param("fieldId") String fieldId);
-
-    int updateByExampleSelective(@Param("record") CustomFieldTestCase record, @Param("example") CustomFieldTestCaseExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") CustomFieldTestCase record, @Param("example") CustomFieldTestCaseExample example);
-
-    int updateByExample(@Param("record") CustomFieldTestCase record, @Param("example") CustomFieldTestCaseExample example);
-
-    int updateByPrimaryKeySelective(CustomFieldTestCase record);
-
-    int updateByPrimaryKeyWithBLOBs(CustomFieldTestCase record);
-
-    int updateByPrimaryKey(CustomFieldTestCase record);
-}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseCustomFieldMapper.java

@@ -0,0 +1,36 @@
+package io.metersphere.functional.mapper;
+
+import io.metersphere.functional.domain.FunctionalCaseCustomField;
+import io.metersphere.functional.domain.FunctionalCaseCustomFieldExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface FunctionalCaseCustomFieldMapper {
+    long countByExample(FunctionalCaseCustomFieldExample example);
+
+    int deleteByExample(FunctionalCaseCustomFieldExample example);
+
+    int deleteByPrimaryKey(@Param("caseId") String caseId, @Param("fieldId") String fieldId);
+
+    int insert(FunctionalCaseCustomField record);
+
+    int insertSelective(FunctionalCaseCustomField record);
+
+    List<FunctionalCaseCustomField> selectByExampleWithBLOBs(FunctionalCaseCustomFieldExample example);
+
+    List<FunctionalCaseCustomField> selectByExample(FunctionalCaseCustomFieldExample example);
+
+    FunctionalCaseCustomField selectByPrimaryKey(@Param("caseId") String caseId, @Param("fieldId") String fieldId);
+
+    int updateByExampleSelective(@Param("record") FunctionalCaseCustomField record, @Param("example") FunctionalCaseCustomFieldExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") FunctionalCaseCustomField record, @Param("example") FunctionalCaseCustomFieldExample example);
+
+    int updateByExample(@Param("record") FunctionalCaseCustomField record, @Param("example") FunctionalCaseCustomFieldExample example);
+
+    int updateByPrimaryKeySelective(FunctionalCaseCustomField record);
+
+    int updateByPrimaryKeyWithBLOBs(FunctionalCaseCustomField record);
+
+    int updateByPrimaryKey(FunctionalCaseCustomField record);
+}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseCustomFieldMapper.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.functional.mapper.CustomFieldTestCaseMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.CustomFieldTestCase">
-    <id column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+<mapper namespace="io.metersphere.functional.mapper.FunctionalCaseCustomFieldMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    <id column="case_id" jdbcType="VARCHAR" property="caseId" />
     <id column="field_id" jdbcType="VARCHAR" property="fieldId" />
     <result column="value" jdbcType="VARCHAR" property="value" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.functional.domain.CustomFieldTestCase">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.functional.domain.FunctionalCaseCustomField">
     <result column="text_value" jdbcType="LONGVARCHAR" property="textValue" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -68,12 +68,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    resource_id, field_id, `value`
+    case_id, field_id, `value`
   </sql>
   <sql id="Blob_Column_List">
     text_value
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.functional.domain.CustomFieldTestCaseExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomFieldExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -81,7 +81,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from custom_field_test_case
+    from functional_case_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -89,13 +89,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.functional.domain.CustomFieldTestCaseExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomFieldExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from custom_field_test_case
+    from functional_case_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -108,32 +108,32 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from custom_field_test_case
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    from functional_case_custom_field
+    where case_id = #{caseId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from custom_field_test_case
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    delete from functional_case_custom_field
+    where case_id = #{caseId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.CustomFieldTestCaseExample">
-    delete from custom_field_test_case
+  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomFieldExample">
+    delete from functional_case_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.functional.domain.CustomFieldTestCase">
-    insert into custom_field_test_case (resource_id, field_id, `value`, 
+  <insert id="insert" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    insert into functional_case_custom_field (case_id, field_id, `value`, 
       text_value)
-    values (#{resourceId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
+    values (#{caseId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
       #{textValue,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.CustomFieldTestCase">
-    insert into custom_field_test_case
+  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    insert into functional_case_custom_field
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="resourceId != null">
-        resource_id,
+      <if test="caseId != null">
+        case_id,
       </if>
       <if test="fieldId != null">
         field_id,
@@ -146,8 +146,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="resourceId != null">
-        #{resourceId,jdbcType=VARCHAR},
+      <if test="caseId != null">
+        #{caseId,jdbcType=VARCHAR},
       </if>
       <if test="fieldId != null">
         #{fieldId,jdbcType=VARCHAR},
@@ -160,17 +160,17 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.functional.domain.CustomFieldTestCaseExample" resultType="java.lang.Long">
-    select count(*) from custom_field_test_case
+  <select id="countByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomFieldExample" resultType="java.lang.Long">
+    select count(*) from functional_case_custom_field
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update custom_field_test_case
+    update functional_case_custom_field
     <set>
-      <if test="record.resourceId != null">
-        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      <if test="record.caseId != null">
+        case_id = #{record.caseId,jdbcType=VARCHAR},
       </if>
       <if test="record.fieldId != null">
         field_id = #{record.fieldId,jdbcType=VARCHAR},
@@ -187,8 +187,8 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update custom_field_test_case
-    set resource_id = #{record.resourceId,jdbcType=VARCHAR},
+    update functional_case_custom_field
+    set case_id = #{record.caseId,jdbcType=VARCHAR},
       field_id = #{record.fieldId,jdbcType=VARCHAR},
       `value` = #{record.value,jdbcType=VARCHAR},
       text_value = #{record.textValue,jdbcType=LONGVARCHAR}
@@ -197,16 +197,16 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update custom_field_test_case
-    set resource_id = #{record.resourceId,jdbcType=VARCHAR},
+    update functional_case_custom_field
+    set case_id = #{record.caseId,jdbcType=VARCHAR},
       field_id = #{record.fieldId,jdbcType=VARCHAR},
       `value` = #{record.value,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.functional.domain.CustomFieldTestCase">
-    update custom_field_test_case
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    update functional_case_custom_field
     <set>
       <if test="value != null">
         `value` = #{value,jdbcType=VARCHAR},
@@ -215,20 +215,20 @@
         text_value = #{textValue,jdbcType=LONGVARCHAR},
       </if>
     </set>
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where case_id = #{caseId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.functional.domain.CustomFieldTestCase">
-    update custom_field_test_case
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    update functional_case_custom_field
     set `value` = #{value,jdbcType=VARCHAR},
       text_value = #{textValue,jdbcType=LONGVARCHAR}
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where case_id = #{caseId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.functional.domain.CustomFieldTestCase">
-    update custom_field_test_case
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.functional.domain.FunctionalCaseCustomField">
+    update functional_case_custom_field
     set `value` = #{value,jdbcType=VARCHAR}
-    where resource_id = #{resourceId,jdbcType=VARCHAR}
+    where case_id = #{caseId,jdbcType=VARCHAR}
       and field_id = #{fieldId,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseFollowMapper.java

@@ -1,24 +0,0 @@
-package io.metersphere.functional.mapper;
-
-import io.metersphere.functional.domain.FunctionalCaseFollow;
-import io.metersphere.functional.domain.FunctionalCaseFollowExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface FunctionalCaseFollowMapper {
-    long countByExample(FunctionalCaseFollowExample example);
-
-    int deleteByExample(FunctionalCaseFollowExample example);
-
-    int deleteByPrimaryKey(@Param("caseId") String caseId, @Param("followId") String followId);
-
-    int insert(FunctionalCaseFollow record);
-
-    int insertSelective(FunctionalCaseFollow record);
-
-    List<FunctionalCaseFollow> selectByExample(FunctionalCaseFollowExample example);
-
-    int updateByExampleSelective(@Param("record") FunctionalCaseFollow record, @Param("example") FunctionalCaseFollowExample example);
-
-    int updateByExample(@Param("record") FunctionalCaseFollow record, @Param("example") FunctionalCaseFollowExample example);
-}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseFollowerMapper.java

@@ -0,0 +1,24 @@
+package io.metersphere.functional.mapper;
+
+import io.metersphere.functional.domain.FunctionalCaseFollower;
+import io.metersphere.functional.domain.FunctionalCaseFollowerExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface FunctionalCaseFollowerMapper {
+    long countByExample(FunctionalCaseFollowerExample example);
+
+    int deleteByExample(FunctionalCaseFollowerExample example);
+
+    int deleteByPrimaryKey(@Param("caseId") String caseId, @Param("userId") String userId);
+
+    int insert(FunctionalCaseFollower record);
+
+    int insertSelective(FunctionalCaseFollower record);
+
+    List<FunctionalCaseFollower> selectByExample(FunctionalCaseFollowerExample example);
+
+    int updateByExampleSelective(@Param("record") FunctionalCaseFollower record, @Param("example") FunctionalCaseFollowerExample example);
+
+    int updateByExample(@Param("record") FunctionalCaseFollower record, @Param("example") FunctionalCaseFollowerExample example);
+}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalCaseFollowerMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.functional.mapper.FunctionalCaseFollowMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.FunctionalCaseFollow">
+<mapper namespace="io.metersphere.functional.mapper.FunctionalCaseFollowerMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.FunctionalCaseFollower">
     <id column="case_id" jdbcType="VARCHAR" property="caseId" />
-    <id column="follow_id" jdbcType="VARCHAR" property="followId" />
+    <id column="user_id" jdbcType="VARCHAR" property="userId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -64,15 +64,15 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    case_id, follow_id
+    case_id, user_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowerExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from functional_case_follow
+    from functional_case_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -81,53 +81,53 @@
     </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="map">
-    delete from functional_case_follow
+    delete from functional_case_follower
     where case_id = #{caseId,jdbcType=VARCHAR}
-      and follow_id = #{followId,jdbcType=VARCHAR}
+      and user_id = #{userId,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowExample">
-    delete from functional_case_follow
+  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowerExample">
+    delete from functional_case_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.functional.domain.FunctionalCaseFollow">
-    insert into functional_case_follow (case_id, follow_id)
-    values (#{caseId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
+  <insert id="insert" parameterType="io.metersphere.functional.domain.FunctionalCaseFollower">
+    insert into functional_case_follower (case_id, user_id)
+    values (#{caseId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.FunctionalCaseFollow">
-    insert into functional_case_follow
+  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.FunctionalCaseFollower">
+    insert into functional_case_follower
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="caseId != null">
         case_id,
       </if>
-      <if test="followId != null">
-        follow_id,
+      <if test="userId != null">
+        user_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="caseId != null">
         #{caseId,jdbcType=VARCHAR},
       </if>
-      <if test="followId != null">
-        #{followId,jdbcType=VARCHAR},
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowExample" resultType="java.lang.Long">
-    select count(*) from functional_case_follow
+  <select id="countByExample" parameterType="io.metersphere.functional.domain.FunctionalCaseFollowerExample" resultType="java.lang.Long">
+    select count(*) from functional_case_follower
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update functional_case_follow
+    update functional_case_follower
     <set>
       <if test="record.caseId != null">
         case_id = #{record.caseId,jdbcType=VARCHAR},
       </if>
-      <if test="record.followId != null">
-        follow_id = #{record.followId,jdbcType=VARCHAR},
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -135,9 +135,9 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update functional_case_follow
+    update functional_case_follower
     set case_id = #{record.caseId,jdbcType=VARCHAR},
-      follow_id = #{record.followId,jdbcType=VARCHAR}
+      user_id = #{record.userId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalMinderExtraNodeMapper.java

@@ -0,0 +1,36 @@
+package io.metersphere.functional.mapper;
+
+import io.metersphere.functional.domain.FunctionalMinderExtraNode;
+import io.metersphere.functional.domain.FunctionalMinderExtraNodeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface FunctionalMinderExtraNodeMapper {
+    long countByExample(FunctionalMinderExtraNodeExample example);
+
+    int deleteByExample(FunctionalMinderExtraNodeExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(FunctionalMinderExtraNode record);
+
+    int insertSelective(FunctionalMinderExtraNode record);
+
+    List<FunctionalMinderExtraNode> selectByExampleWithBLOBs(FunctionalMinderExtraNodeExample example);
+
+    List<FunctionalMinderExtraNode> selectByExample(FunctionalMinderExtraNodeExample example);
+
+    FunctionalMinderExtraNode selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") FunctionalMinderExtraNode record, @Param("example") FunctionalMinderExtraNodeExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") FunctionalMinderExtraNode record, @Param("example") FunctionalMinderExtraNodeExample example);
+
+    int updateByExample(@Param("record") FunctionalMinderExtraNode record, @Param("example") FunctionalMinderExtraNodeExample example);
+
+    int updateByPrimaryKeySelective(FunctionalMinderExtraNode record);
+
+    int updateByPrimaryKeyWithBLOBs(FunctionalMinderExtraNode record);
+
+    int updateByPrimaryKey(FunctionalMinderExtraNode record);
+}

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/FunctionalMinderExtraNodeMapper.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.functional.mapper.MinderExtraNodeMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.MinderExtraNode">
+<mapper namespace="io.metersphere.functional.mapper.FunctionalMinderExtraNodeMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.functional.domain.FunctionalMinderExtraNode">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
     <result column="group_id" jdbcType="VARCHAR" property="groupId" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.functional.domain.MinderExtraNode">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.functional.domain.FunctionalMinderExtraNode">
     <result column="node_data" jdbcType="LONGVARCHAR" property="nodeData" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -69,12 +68,12 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, parent_id, group_id, `type`
+    id, parent_id, group_id
   </sql>
   <sql id="Blob_Column_List">
     node_data
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.functional.domain.MinderExtraNodeExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNodeExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -82,7 +81,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from minder_extra_node
+    from functional_minder_extra_node
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -90,13 +89,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.functional.domain.MinderExtraNodeExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNodeExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from minder_extra_node
+    from functional_minder_extra_node
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -109,27 +108,27 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from minder_extra_node
+    from functional_minder_extra_node
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from minder_extra_node
+    delete from functional_minder_extra_node
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.MinderExtraNodeExample">
-    delete from minder_extra_node
+  <delete id="deleteByExample" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNodeExample">
+    delete from functional_minder_extra_node
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.functional.domain.MinderExtraNode">
-    insert into minder_extra_node (id, parent_id, group_id, 
-      `type`, node_data)
+  <insert id="insert" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNode">
+    insert into functional_minder_extra_node (id, parent_id, group_id, 
+      node_data)
     values (#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
-      #{type,jdbcType=VARCHAR}, #{nodeData,jdbcType=LONGVARCHAR})
+      #{nodeData,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.MinderExtraNode">
-    insert into minder_extra_node
+  <insert id="insertSelective" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNode">
+    insert into functional_minder_extra_node
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -140,9 +139,6 @@
       <if test="groupId != null">
         group_id,
       </if>
-      <if test="type != null">
-        `type`,
-      </if>
       <if test="nodeData != null">
         node_data,
       </if>
@@ -157,22 +153,19 @@
       <if test="groupId != null">
         #{groupId,jdbcType=VARCHAR},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
       <if test="nodeData != null">
         #{nodeData,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.functional.domain.MinderExtraNodeExample" resultType="java.lang.Long">
-    select count(*) from minder_extra_node
+  <select id="countByExample" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNodeExample" resultType="java.lang.Long">
+    select count(*) from functional_minder_extra_node
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update minder_extra_node
+    update functional_minder_extra_node
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -183,9 +176,6 @@
       <if test="record.groupId != null">
         group_id = #{record.groupId,jdbcType=VARCHAR},
       </if>
-      <if test="record.type != null">
-        `type` = #{record.type,jdbcType=VARCHAR},
-      </if>
       <if test="record.nodeData != null">
         node_data = #{record.nodeData,jdbcType=LONGVARCHAR},
       </if>
@@ -195,28 +185,26 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update minder_extra_node
+    update functional_minder_extra_node
     set id = #{record.id,jdbcType=VARCHAR},
       parent_id = #{record.parentId,jdbcType=VARCHAR},
       group_id = #{record.groupId,jdbcType=VARCHAR},
-      `type` = #{record.type,jdbcType=VARCHAR},
       node_data = #{record.nodeData,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update minder_extra_node
+    update functional_minder_extra_node
     set id = #{record.id,jdbcType=VARCHAR},
       parent_id = #{record.parentId,jdbcType=VARCHAR},
-      group_id = #{record.groupId,jdbcType=VARCHAR},
-      `type` = #{record.type,jdbcType=VARCHAR}
+      group_id = #{record.groupId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.functional.domain.MinderExtraNode">
-    update minder_extra_node
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNode">
+    update functional_minder_extra_node
     <set>
       <if test="parentId != null">
         parent_id = #{parentId,jdbcType=VARCHAR},
@@ -224,28 +212,23 @@
       <if test="groupId != null">
         group_id = #{groupId,jdbcType=VARCHAR},
       </if>
-      <if test="type != null">
-        `type` = #{type,jdbcType=VARCHAR},
-      </if>
       <if test="nodeData != null">
         node_data = #{nodeData,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.functional.domain.MinderExtraNode">
-    update minder_extra_node
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNode">
+    update functional_minder_extra_node
     set parent_id = #{parentId,jdbcType=VARCHAR},
       group_id = #{groupId,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR},
       node_data = #{nodeData,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.functional.domain.MinderExtraNode">
-    update minder_extra_node
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.functional.domain.FunctionalMinderExtraNode">
+    update functional_minder_extra_node
     set parent_id = #{parentId,jdbcType=VARCHAR},
-      group_id = #{groupId,jdbcType=VARCHAR},
-      `type` = #{type,jdbcType=VARCHAR}
+      group_id = #{groupId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/framework/domain/src/main/java/io/metersphere/functional/mapper/MinderExtraNodeMapper.java

@@ -1,36 +0,0 @@
-package io.metersphere.functional.mapper;
-
-import io.metersphere.functional.domain.MinderExtraNode;
-import io.metersphere.functional.domain.MinderExtraNodeExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface MinderExtraNodeMapper {
-    long countByExample(MinderExtraNodeExample example);
-
-    int deleteByExample(MinderExtraNodeExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(MinderExtraNode record);
-
-    int insertSelective(MinderExtraNode record);
-
-    List<MinderExtraNode> selectByExampleWithBLOBs(MinderExtraNodeExample example);
-
-    List<MinderExtraNode> selectByExample(MinderExtraNodeExample example);
-
-    MinderExtraNode selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") MinderExtraNode record, @Param("example") MinderExtraNodeExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") MinderExtraNode record, @Param("example") MinderExtraNodeExample example);
-
-    int updateByExample(@Param("record") MinderExtraNode record, @Param("example") MinderExtraNodeExample example);
-
-    int updateByPrimaryKeySelective(MinderExtraNode record);
-
-    int updateByPrimaryKeyWithBLOBs(MinderExtraNode record);
-
-    int updateByPrimaryKey(MinderExtraNode record);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/domain/CustomFieldIssues.java

@@ -1,28 +0,0 @@
-package io.metersphere.issue.domain;
-
-import io.metersphere.validation.groups.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class CustomFieldIssues implements Serializable {
-    @Schema(title = "资源ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{custom_field_issues.resource_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{custom_field_issues.resource_id.length_range}", groups = {Created.class, Updated.class})
-    private String resourceId;
-
-    @Schema(title = "字段ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{custom_field_issues.field_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{custom_field_issues.field_id.length_range}", groups = {Created.class, Updated.class})
-    private String fieldId;
-
-    @Schema(title = "字段值")
-    private String value;
-
-    @Schema(title = "文本类型字段值")
-    private byte[] textValue;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/issue/domain/IssueAttachment.java

@@ -1,22 +0,0 @@
-package io.metersphere.issue.domain;
-
-import io.metersphere.validation.groups.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class IssueAttachment implements Serializable {
-    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_attachment.issue_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue_attachment.issue_id.length_range}", groups = {Created.class, Updated.class})
-    private String issueId;
-
-    @Schema(title = "文件的ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_attachment.file_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue_attachment.file_id.length_range}", groups = {Created.class, Updated.class})
-    private String fileId;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/issue/domain/IssueComment.java

@@ -1,36 +0,0 @@
-package io.metersphere.issue.domain;
-
-import io.metersphere.validation.groups.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class IssueComment implements Serializable {
-    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_comment.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 64, message = "{issue_comment.id.length_range}", groups = {Created.class, Updated.class})
-    private String id;
-
-    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_comment.issue_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 64, message = "{issue_comment.issue_id.length_range}", groups = {Created.class, Updated.class})
-    private String issueId;
-
-    @Schema(title = "评论人")
-    private String createUser;
-
-    @Schema(title = "创建时间")
-    private Long createTime;
-
-    @Schema(title = "更新时间")
-    private Long updateTime;
-
-    @Schema(title = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_comment.description.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 65535, message = "{issue_comment.description.length_range}", groups = {Created.class, Updated.class})
-    private String description;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/issue/domain/IssuesFunctionalCase.java

@@ -1,43 +0,0 @@
-package io.metersphere.issue.domain;
-
-import io.metersphere.validation.groups.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
-import java.io.Serializable;
-import lombok.Data;
-
-@Data
-public class IssuesFunctionalCase implements Serializable {
-    @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issues_functional_case.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 50, message = "{issues_functional_case.id.length_range}", groups = {Created.class, Updated.class})
-    private String id;
-
-    @Schema(title = "功能用例或测试计划功能用例ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issues_functional_case.resource_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issues_functional_case.resource_id.length_range}", groups = {Created.class, Updated.class})
-    private String resourceId;
-
-    @Schema(title = "缺陷ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issues_functional_case.issues_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issues_functional_case.issues_id.length_range}", groups = {Created.class, Updated.class})
-    private String issuesId;
-
-    @Schema(title = "关联的类型：关联功能用例/关联测试计划功能用例", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issues_functional_case.ref_type.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 64, message = "{issues_functional_case.ref_type.length_range}", groups = {Created.class, Updated.class})
-    private String refType;
-
-    @Schema(title = "测试计划的用例所指向的用例的id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issues_functional_case.ref_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issues_functional_case.ref_id.length_range}", groups = {Created.class, Updated.class})
-    private String refId;
-
-    @Schema(title = "创建时间")
-    private Long createTime;
-
-    @Schema(title = "更新时间")
-    private Long updateTime;
-
-    private static final long serialVersionUID = 1L;
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/CustomFieldIssuesMapper.java

@@ -1,36 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.CustomFieldIssues;
-import io.metersphere.issue.domain.CustomFieldIssuesExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CustomFieldIssuesMapper {
-    long countByExample(CustomFieldIssuesExample example);
-
-    int deleteByExample(CustomFieldIssuesExample example);
-
-    int deleteByPrimaryKey(@Param("resourceId") String resourceId, @Param("fieldId") String fieldId);
-
-    int insert(CustomFieldIssues record);
-
-    int insertSelective(CustomFieldIssues record);
-
-    List<CustomFieldIssues> selectByExampleWithBLOBs(CustomFieldIssuesExample example);
-
-    List<CustomFieldIssues> selectByExample(CustomFieldIssuesExample example);
-
-    CustomFieldIssues selectByPrimaryKey(@Param("resourceId") String resourceId, @Param("fieldId") String fieldId);
-
-    int updateByExampleSelective(@Param("record") CustomFieldIssues record, @Param("example") CustomFieldIssuesExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") CustomFieldIssues record, @Param("example") CustomFieldIssuesExample example);
-
-    int updateByExample(@Param("record") CustomFieldIssues record, @Param("example") CustomFieldIssuesExample example);
-
-    int updateByPrimaryKeySelective(CustomFieldIssues record);
-
-    int updateByPrimaryKeyWithBLOBs(CustomFieldIssues record);
-
-    int updateByPrimaryKey(CustomFieldIssues record);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssueAttachmentMapper.java

@@ -1,24 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.IssueAttachment;
-import io.metersphere.issue.domain.IssueAttachmentExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueAttachmentMapper {
-    long countByExample(IssueAttachmentExample example);
-
-    int deleteByExample(IssueAttachmentExample example);
-
-    int deleteByPrimaryKey(@Param("issueId") String issueId, @Param("fileId") String fileId);
-
-    int insert(IssueAttachment record);
-
-    int insertSelective(IssueAttachment record);
-
-    List<IssueAttachment> selectByExample(IssueAttachmentExample example);
-
-    int updateByExampleSelective(@Param("record") IssueAttachment record, @Param("example") IssueAttachmentExample example);
-
-    int updateByExample(@Param("record") IssueAttachment record, @Param("example") IssueAttachmentExample example);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssueBlobMapper.java

@@ -1,34 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.IssueBlob;
-import io.metersphere.issue.domain.IssueBlobExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueBlobMapper {
-    long countByExample(IssueBlobExample example);
-
-    int deleteByExample(IssueBlobExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(IssueBlob record);
-
-    int insertSelective(IssueBlob record);
-
-    List<IssueBlob> selectByExampleWithBLOBs(IssueBlobExample example);
-
-    List<IssueBlob> selectByExample(IssueBlobExample example);
-
-    IssueBlob selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") IssueBlob record, @Param("example") IssueBlobExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") IssueBlob record, @Param("example") IssueBlobExample example);
-
-    int updateByExample(@Param("record") IssueBlob record, @Param("example") IssueBlobExample example);
-
-    int updateByPrimaryKeySelective(IssueBlob record);
-
-    int updateByPrimaryKeyWithBLOBs(IssueBlob record);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssueCommentMapper.java

@@ -1,36 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.IssueComment;
-import io.metersphere.issue.domain.IssueCommentExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueCommentMapper {
-    long countByExample(IssueCommentExample example);
-
-    int deleteByExample(IssueCommentExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(IssueComment record);
-
-    int insertSelective(IssueComment record);
-
-    List<IssueComment> selectByExampleWithBLOBs(IssueCommentExample example);
-
-    List<IssueComment> selectByExample(IssueCommentExample example);
-
-    IssueComment selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") IssueComment record, @Param("example") IssueCommentExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") IssueComment record, @Param("example") IssueCommentExample example);
-
-    int updateByExample(@Param("record") IssueComment record, @Param("example") IssueCommentExample example);
-
-    int updateByPrimaryKeySelective(IssueComment record);
-
-    int updateByPrimaryKeyWithBLOBs(IssueComment record);
-
-    int updateByPrimaryKey(IssueComment record);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssueFollowMapper.java

@@ -1,24 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.IssueFollow;
-import io.metersphere.issue.domain.IssueFollowExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueFollowMapper {
-    long countByExample(IssueFollowExample example);
-
-    int deleteByExample(IssueFollowExample example);
-
-    int deleteByPrimaryKey(@Param("issueId") String issueId, @Param("followId") String followId);
-
-    int insert(IssueFollow record);
-
-    int insertSelective(IssueFollow record);
-
-    List<IssueFollow> selectByExample(IssueFollowExample example);
-
-    int updateByExampleSelective(@Param("record") IssueFollow record, @Param("example") IssueFollowExample example);
-
-    int updateByExample(@Param("record") IssueFollow record, @Param("example") IssueFollowExample example);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssueMapper.java

@@ -1,30 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.Issue;
-import io.metersphere.issue.domain.IssueExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueMapper {
-    long countByExample(IssueExample example);
-
-    int deleteByExample(IssueExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(Issue record);
-
-    int insertSelective(Issue record);
-
-    List<Issue> selectByExample(IssueExample example);
-
-    Issue selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") Issue record, @Param("example") IssueExample example);
-
-    int updateByExample(@Param("record") Issue record, @Param("example") IssueExample example);
-
-    int updateByPrimaryKeySelective(Issue record);
-
-    int updateByPrimaryKey(Issue record);
-}

backend/framework/domain/src/main/java/io/metersphere/issue/mapper/IssuesFunctionalCaseMapper.java

@@ -1,30 +0,0 @@
-package io.metersphere.issue.mapper;
-
-import io.metersphere.issue.domain.IssuesFunctionalCase;
-import io.metersphere.issue.domain.IssuesFunctionalCaseExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssuesFunctionalCaseMapper {
-    long countByExample(IssuesFunctionalCaseExample example);
-
-    int deleteByExample(IssuesFunctionalCaseExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(IssuesFunctionalCase record);
-
-    int insertSelective(IssuesFunctionalCase record);
-
-    List<IssuesFunctionalCase> selectByExample(IssuesFunctionalCaseExample example);
-
-    IssuesFunctionalCase selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") IssuesFunctionalCase record, @Param("example") IssuesFunctionalCaseExample example);
-
-    int updateByExample(@Param("record") IssuesFunctionalCase record, @Param("example") IssuesFunctionalCaseExample example);
-
-    int updateByPrimaryKeySelective(IssuesFunctionalCase record);
-
-    int updateByPrimaryKey(IssuesFunctionalCase record);
-}

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

@@ -7,22 +7,22 @@ import java.io.Serializable;
 import lombok.Data;
 
 @Data
-public class IssueTemplate implements Serializable {
+public class BugTemplate implements Serializable {
     @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_template.id.not_blank}", groups = {Updated.class})
-    @Size(min = 1, max = 50, message = "{issue_template.id.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug_template.id.not_blank}", groups = {Updated.class})
+    @Size(min = 1, max = 50, message = "{bug_template.id.length_range}", groups = {Created.class, Updated.class})
     private String id;
 
     @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_template.name.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 255, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug_template.name.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 255, message = "{bug_template.name.length_range}", groups = {Created.class, Updated.class})
     private String name;
 
     @Schema(title = "描述")
     private String description;
 
     @Schema(title = "是否是系统模板", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{issue_template.system.not_blank}", groups = {Created.class})
+    @NotNull(message = "{bug_template.system.not_blank}", groups = {Created.class})
     private Boolean system;
 
     @Schema(title = "创建时间")
@@ -32,8 +32,8 @@ public class IssueTemplate implements Serializable {
     private String createUser;
 
     @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{issue_template.project_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{issue_template.project_id.length_range}", groups = {Created.class, Updated.class})
+    @NotBlank(message = "{bug_template.project_id.not_blank}", groups = {Created.class})
+    @Size(min = 1, max = 50, message = "{bug_template.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/project/domain/BugTemplateExample.java

@@ -3,14 +3,14 @@ package io.metersphere.project.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueTemplateExample {
+public class BugTemplateExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueTemplateExample() {
+    public BugTemplateExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

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

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

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

@@ -3,14 +3,14 @@ package io.metersphere.project.domain;
 import java.util.ArrayList;
 import java.util.List;
 
-public class IssueTemplateExtendExample {
+public class BugTemplateExtendExample {
     protected String orderByClause;
 
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
 
-    public IssueTemplateExtendExample() {
+    public BugTemplateExtendExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

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/BugTemplateExtendMapper.java

@@ -0,0 +1,36 @@
+package io.metersphere.project.mapper;
+
+import io.metersphere.project.domain.BugTemplateExtend;
+import io.metersphere.project.domain.BugTemplateExtendExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugTemplateExtendMapper {
+    long countByExample(BugTemplateExtendExample example);
+
+    int deleteByExample(BugTemplateExtendExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BugTemplateExtend record);
+
+    int insertSelective(BugTemplateExtend record);
+
+    List<BugTemplateExtend> selectByExampleWithBLOBs(BugTemplateExtendExample example);
+
+    List<BugTemplateExtend> selectByExample(BugTemplateExtendExample example);
+
+    BugTemplateExtend selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BugTemplateExtend record, @Param("example") BugTemplateExtendExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") BugTemplateExtend record, @Param("example") BugTemplateExtendExample example);
+
+    int updateByExample(@Param("record") BugTemplateExtend record, @Param("example") BugTemplateExtendExample example);
+
+    int updateByPrimaryKeySelective(BugTemplateExtend record);
+
+    int updateByPrimaryKeyWithBLOBs(BugTemplateExtend record);
+
+    int updateByPrimaryKey(BugTemplateExtend record);
+}

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.project.mapper.IssueTemplateExtendMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.project.domain.IssueTemplateExtend">
+<mapper namespace="io.metersphere.project.mapper.BugTemplateExtendMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.project.domain.BugTemplateExtend">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="title" jdbcType="VARCHAR" property="title" />
   </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.IssueTemplateExtend">
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.project.domain.BugTemplateExtend">
     <result column="content" jdbcType="LONGVARCHAR" property="content" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -72,7 +72,7 @@
   <sql id="Blob_Column_List">
     content
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.project.domain.IssueTemplateExtendExample" resultMap="ResultMapWithBLOBs">
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.project.domain.BugTemplateExtendExample" resultMap="ResultMapWithBLOBs">
     select
     <if test="distinct">
       distinct
@@ -80,7 +80,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_template_extend
+    from bug_template_extend
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -88,13 +88,13 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" parameterType="io.metersphere.project.domain.IssueTemplateExtendExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.project.domain.BugTemplateExtendExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_template_extend
+    from bug_template_extend
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -107,27 +107,27 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from issue_template_extend
+    from bug_template_extend
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issue_template_extend
+    delete from bug_template_extend
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.project.domain.IssueTemplateExtendExample">
-    delete from issue_template_extend
+  <delete id="deleteByExample" parameterType="io.metersphere.project.domain.BugTemplateExtendExample">
+    delete from bug_template_extend
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    insert into issue_template_extend (id, title, content
+  <insert id="insert" parameterType="io.metersphere.project.domain.BugTemplateExtend">
+    insert into bug_template_extend (id, title, content
       )
     values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    insert into issue_template_extend
+  <insert id="insertSelective" parameterType="io.metersphere.project.domain.BugTemplateExtend">
+    insert into bug_template_extend
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -151,14 +151,14 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.project.domain.IssueTemplateExtendExample" resultType="java.lang.Long">
-    select count(*) from issue_template_extend
+  <select id="countByExample" parameterType="io.metersphere.project.domain.BugTemplateExtendExample" resultType="java.lang.Long">
+    select count(*) from bug_template_extend
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_template_extend
+    update bug_template_extend
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -175,7 +175,7 @@
     </if>
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
-    update issue_template_extend
+    update bug_template_extend
     set id = #{record.id,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=LONGVARCHAR}
@@ -184,15 +184,15 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_template_extend
+    update bug_template_extend
     set id = #{record.id,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    update issue_template_extend
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.project.domain.BugTemplateExtend">
+    update bug_template_extend
     <set>
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
@@ -203,14 +203,14 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    update issue_template_extend
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.project.domain.BugTemplateExtend">
+    update bug_template_extend
     set title = #{title,jdbcType=VARCHAR},
       content = #{content,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.IssueTemplateExtend">
-    update issue_template_extend
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.BugTemplateExtend">
+    update bug_template_extend
     set title = #{title,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>

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

@@ -0,0 +1,30 @@
+package io.metersphere.project.mapper;
+
+import io.metersphere.project.domain.BugTemplate;
+import io.metersphere.project.domain.BugTemplateExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BugTemplateMapper {
+    long countByExample(BugTemplateExample example);
+
+    int deleteByExample(BugTemplateExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(BugTemplate record);
+
+    int insertSelective(BugTemplate record);
+
+    List<BugTemplate> selectByExample(BugTemplateExample example);
+
+    BugTemplate selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") BugTemplate record, @Param("example") BugTemplateExample example);
+
+    int updateByExample(@Param("record") BugTemplate record, @Param("example") BugTemplateExample example);
+
+    int updateByPrimaryKeySelective(BugTemplate record);
+
+    int updateByPrimaryKey(BugTemplate record);
+}

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.metersphere.project.mapper.IssueTemplateMapper">
-  <resultMap id="BaseResultMap" type="io.metersphere.project.domain.IssueTemplate">
+<mapper namespace="io.metersphere.project.mapper.BugTemplateMapper">
+  <resultMap id="BaseResultMap" type="io.metersphere.project.domain.BugTemplate">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
@@ -71,13 +71,13 @@
   <sql id="Base_Column_List">
     id, `name`, description, `system`, create_time, create_user, project_id
   </sql>
-  <select id="selectByExample" parameterType="io.metersphere.project.domain.IssueTemplateExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="io.metersphere.project.domain.BugTemplateExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from issue_template
+    from bug_template
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -88,29 +88,29 @@
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from issue_template
+    from bug_template
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issue_template
+    delete from bug_template
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="io.metersphere.project.domain.IssueTemplateExample">
-    delete from issue_template
+  <delete id="deleteByExample" parameterType="io.metersphere.project.domain.BugTemplateExample">
+    delete from bug_template
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="io.metersphere.project.domain.IssueTemplate">
-    insert into issue_template (id, `name`, description, 
+  <insert id="insert" parameterType="io.metersphere.project.domain.BugTemplate">
+    insert into bug_template (id, `name`, description, 
       `system`, 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}, 
       #{projectId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="io.metersphere.project.domain.IssueTemplate">
-    insert into issue_template
+  <insert id="insertSelective" parameterType="io.metersphere.project.domain.BugTemplate">
+    insert into bug_template
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -158,14 +158,14 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="io.metersphere.project.domain.IssueTemplateExample" resultType="java.lang.Long">
-    select count(*) from issue_template
+  <select id="countByExample" parameterType="io.metersphere.project.domain.BugTemplateExample" resultType="java.lang.Long">
+    select count(*) from bug_template
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
-    update issue_template
+    update bug_template
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -194,7 +194,7 @@
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
-    update issue_template
+    update bug_template
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
@@ -206,8 +206,8 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.project.domain.IssueTemplate">
-    update issue_template
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.project.domain.BugTemplate">
+    update bug_template
     <set>
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
@@ -230,8 +230,8 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.IssueTemplate">
-    update issue_template
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.project.domain.BugTemplate">
+    update bug_template
     set `name` = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       `system` = #{system,jdbcType=BIT},

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

@@ -1,36 +0,0 @@
-package io.metersphere.project.mapper;
-
-import io.metersphere.project.domain.IssueTemplateExtend;
-import io.metersphere.project.domain.IssueTemplateExtendExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueTemplateExtendMapper {
-    long countByExample(IssueTemplateExtendExample example);
-
-    int deleteByExample(IssueTemplateExtendExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(IssueTemplateExtend record);
-
-    int insertSelective(IssueTemplateExtend record);
-
-    List<IssueTemplateExtend> selectByExampleWithBLOBs(IssueTemplateExtendExample example);
-
-    List<IssueTemplateExtend> selectByExample(IssueTemplateExtendExample example);
-
-    IssueTemplateExtend selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") IssueTemplateExtend record, @Param("example") IssueTemplateExtendExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") IssueTemplateExtend record, @Param("example") IssueTemplateExtendExample example);
-
-    int updateByExample(@Param("record") IssueTemplateExtend record, @Param("example") IssueTemplateExtendExample example);
-
-    int updateByPrimaryKeySelective(IssueTemplateExtend record);
-
-    int updateByPrimaryKeyWithBLOBs(IssueTemplateExtend record);
-
-    int updateByPrimaryKey(IssueTemplateExtend record);
-}

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

@@ -1,30 +0,0 @@
-package io.metersphere.project.mapper;
-
-import io.metersphere.project.domain.IssueTemplate;
-import io.metersphere.project.domain.IssueTemplateExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface IssueTemplateMapper {
-    long countByExample(IssueTemplateExample example);
-
-    int deleteByExample(IssueTemplateExample example);
-
-    int deleteByPrimaryKey(String id);
-
-    int insert(IssueTemplate record);
-
-    int insertSelective(IssueTemplate record);
-
-    List<IssueTemplate> selectByExample(IssueTemplateExample example);
-
-    IssueTemplate selectByPrimaryKey(String id);
-
-    int updateByExampleSelective(@Param("record") IssueTemplate record, @Param("example") IssueTemplateExample example);
-
-    int updateByExample(@Param("record") IssueTemplate record, @Param("example") IssueTemplateExample example);
-
-    int updateByPrimaryKeySelective(IssueTemplate record);
-
-    int updateByPrimaryKey(IssueTemplate record);
-}

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/resources/bugGeneratorConfig.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
+<generatorConfiguration>
+    <!--配置数据库连接的位置-->
+    <properties url="file:///opt/metersphere/conf/metersphere.properties"/>
+    <!-- 设置mysql驱动路径 -->
+    <!--<classPathEntry location="/Users/liuruibin/.m2/repository/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar"/>-->
+    <!-- 此处指定生成针对MyBatis3的DAO -->
+    <context id="mysql" targetRuntime="MyBatis3" defaultModelType="flat">
+        <!-- 字段带`,解决列表跟关键字冲突问题 -->
+        <property name="autoDelimitKeywords" value="true"/>
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
+        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin"/>
+        <plugin type="io.metersphere.tools.mybatis.swagger.ImportSwagger3Plugin"/>
+        <plugin type="io.metersphere.tools.mybatis.validation.ImportValidatorPlugin"/>
+
+        <!-- Lombok插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.LombokPlugin">
+            <!-- @Data 默认开启,同时插件会对子类自动附加@EqualsAndHashCode(callSuper = true)，@ToString(callSuper = true) -->
+            <property name="@Data" value="true"/>
+            <!-- @Builder 必须在 Lombok 版本 >= 1.18.2 的情况下开启，对存在继承关系的类自动替换成@SuperBuilder -->
+            <property name="@Builder" value="false"/>
+            <!-- @NoArgsConstructor 和 @AllArgsConstructor 使用规则和Lombok一致 -->
+            <property name="@AllArgsConstructor" value="false"/>
+            <property name="@NoArgsConstructor" value="false"/>
+            <!-- @Getter、@Setter、@Accessors 等使用规则参见官方文档 -->
+            <property name="@Accessors(chain = true)" value="false"/>
+            <!-- 临时解决IDEA工具对@SuperBuilder的不支持问题，开启后(默认未开启)插件在遇到@SuperBuilder注解时会调用ModelBuilderPlugin来生成相应的builder代码 -->
+            <property name="supportSuperBuilderForIdea" value="false"/>
+        </plugin>
+
+
+        <!-- 用来除去时间信息的，这在配合类似subversion的代码管理工具时使用很有效，因为可以减少没有必要的注释迁入 -->
+        <commentGenerator type="io.metersphere.tools.mybatis.validation.SchemaAnnotationGenerator">
+            <property name="suppressDate" value="true"/>
+            <!--  关闭自动生成的注释  -->
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+
+        <!-- jdbc连接信息 --> <!-- EduLoanManage EduTestDataBase -->
+        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
+                        connectionURL="${spring.datasource.url}&amp;nullCatalogMeansCurrent=true"
+                        userId="${spring.datasource.username}"
+                        password="${spring.datasource.password}"/>
+
+        <!-- javaTypeResolver式类型转换的信息 -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+        <!-- 模型对象 -->
+        <javaModelGenerator targetPackage="io.metersphere.bug.domain" targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+        <!-- XML映射文件 -->
+        <sqlMapGenerator targetPackage="io.metersphere.bug.mapper" targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+        </sqlMapGenerator>
+        <!-- 接口 -->
+        <javaClientGenerator type="XMLMAPPER" targetPackage="io.metersphere.bug.mapper"
+                             targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+        </javaClientGenerator>
+
+        <!--要生成的数据库表 -->
+        <table tableName="bug" />
+        <table tableName="bug_blob" />
+        <table tableName="bug_functional_case" />
+        <table tableName="bug_attachment" />
+        <table tableName="bug_comment" />
+        <table tableName="bug_follower" />
+        <table tableName="bug_custom_field" />
+
+        <!--        要忽略的字段-->
+        <!-- <table tableName="test_case">
+             <ignoreColumn column="follow_people"/>
+         </table>-->
+
+        <!--        表名和关键字冲突-->
+        <!--                <table tableName="group" delimitIdentifiers="true"></table>-->
+
+    </context>
+</generatorConfiguration>

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

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
+<generatorConfiguration>
+    <!--配置数据库连接的位置-->
+    <properties url="file:///opt/metersphere/conf/metersphere.properties"/>
+    <!-- 设置mysql驱动路径 -->
+    <!--<classPathEntry location="/Users/liuruibin/.m2/repository/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar"/>-->
+    <!-- 此处指定生成针对MyBatis3的DAO -->
+    <context id="mysql" targetRuntime="MyBatis3" defaultModelType="flat">
+        <!-- 字段带`,解决列表跟关键字冲突问题 -->
+        <property name="autoDelimitKeywords" value="true"/>
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
+        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin"/>
+        <plugin type="io.metersphere.tools.mybatis.swagger.ImportSwagger3Plugin"/>
+        <plugin type="io.metersphere.tools.mybatis.validation.ImportValidatorPlugin"/>
+
+        <!-- Lombok插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.LombokPlugin">
+            <!-- @Data 默认开启,同时插件会对子类自动附加@EqualsAndHashCode(callSuper = true)，@ToString(callSuper = true) -->
+            <property name="@Data" value="true"/>
+            <!-- @Builder 必须在 Lombok 版本 >= 1.18.2 的情况下开启，对存在继承关系的类自动替换成@SuperBuilder -->
+            <property name="@Builder" value="false"/>
+            <!-- @NoArgsConstructor 和 @AllArgsConstructor 使用规则和Lombok一致 -->
+            <property name="@AllArgsConstructor" value="false"/>
+            <property name="@NoArgsConstructor" value="false"/>
+            <!-- @Getter、@Setter、@Accessors 等使用规则参见官方文档 -->
+            <property name="@Accessors(chain = true)" value="false"/>
+            <!-- 临时解决IDEA工具对@SuperBuilder的不支持问题，开启后(默认未开启)插件在遇到@SuperBuilder注解时会调用ModelBuilderPlugin来生成相应的builder代码 -->
+            <property name="supportSuperBuilderForIdea" value="false"/>
+        </plugin>
+
+
+        <!-- 用来除去时间信息的，这在配合类似subversion的代码管理工具时使用很有效，因为可以减少没有必要的注释迁入 -->
+        <commentGenerator type="io.metersphere.tools.mybatis.validation.SchemaAnnotationGenerator">
+            <property name="suppressDate" value="true"/>
+            <!--  关闭自动生成的注释  -->
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+
+        <!-- jdbc连接信息 --> <!-- EduLoanManage EduTestDataBase -->
+        <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
+                        connectionURL="${spring.datasource.url}&amp;nullCatalogMeansCurrent=true"
+                        userId="${spring.datasource.username}"
+                        password="${spring.datasource.password}"/>
+
+        <!-- javaTypeResolver式类型转换的信息 -->
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+        <!-- 模型对象 -->
+        <javaModelGenerator targetPackage="io.metersphere.functional.domain" targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+        <!-- XML映射文件 -->
+        <sqlMapGenerator targetPackage="io.metersphere.functional.mapper" targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+        </sqlMapGenerator>
+        <!-- 接口 -->
+        <javaClientGenerator type="XMLMAPPER" targetPackage="io.metersphere.functional.mapper"
+                             targetProject="src/main/java">
+            <property name="enableSubPackages" value="true"/>
+        </javaClientGenerator>
+
+        <!--要生成的数据库表 -->
+        <table tableName="functional_case" />
+        <table tableName="functional_case_blob" />
+        <table tableName="functional_case_comment" />
+        <table tableName="functional_case_module" />
+        <table tableName="functional_case_attachment" />
+        <table tableName="functional_case_follower" />
+        <table tableName="functional_case_relationship_edge" />
+        <table tableName="functional_case_test" />
+        <table tableName="functional_minder_extra_node" />
+        <table tableName="functional_case_custom_field" />
+
+        <table tableName="case_review" />
+        <table tableName="case_review_user" />
+        <table tableName="case_review_functional_case" />
+        <table tableName="case_review_functional_case_user" />
+        <table tableName="case_review_follower" />
+
+
+        <!--        要忽略的字段-->
+        <!-- <table tableName="test_case">
+             <ignoreColumn column="follow_people"/>
+         </table>-->
+
+        <!--        表名和关键字冲突-->
+        <!--                <table tableName="group" delimitIdentifiers="true"></table>-->
+
+    </context>
+</generatorConfiguration>

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

@@ -84,8 +84,8 @@
         <table tableName="project_extend"/>
         <table tableName="functional_case_template"/>
         <table tableName="functional_case_template_extend"/>
-        <table tableName="issue_template_extend"/>
-        <table tableName="issue_template"/>
+        <table tableName="bug_template_extend"/>
+        <table tableName="bug_template"/>
         <table tableName="api_template"/>
 
         <!--        要忽略的字段-->

backend/framework/plugin/src/main/java/io/metersphere/plugin/platform/api/Platform.java

@@ -21,10 +21,10 @@ public interface Platform {
     /**
      * 创建缺陷并封装 MS 返回
      * 创建缺陷时调用
-     * @param issuesRequest issueRequest
+     * @param bugsRequest bugRequest
      * @return MS 缺陷
      */
-    MsIssueDTO addIssue(PlatformIssuesUpdateRequest issuesRequest);
+    MsBugDTO addBug(PlatformBugUpdateRequest bugsRequest);
 
     /**
      * 项目设置和缺陷表单中，调用接口获取下拉框选项
@@ -39,14 +39,14 @@ public interface Platform {
      * @param request
      * @return MS 缺陷
      */
-    MsIssueDTO updateIssue(PlatformIssuesUpdateRequest request);
+    MsBugDTO updateBug(PlatformBugUpdateRequest request);
 
     /**
      * 删除缺陷平台缺陷
      * 删除缺陷时调用
      * @param id 平台的缺陷 ID
      */
-    void deleteIssue(String id);
+    void deleteBug(String id);
 
     /**
      * 校验服务集成配置
@@ -69,7 +69,7 @@ public interface Platform {
     /**
      * 支持附件上传
      * 编辑缺陷上传附件是会调用判断是否支持附件上传
-     * 如果支持会调用 syncIssuesAttachment 上传缺陷到第三方平台
+     * 如果支持会调用 syncBugsAttachment 上传缺陷到第三方平台
      */
     boolean isAttachmentUploadSupport();
 
@@ -77,13 +77,13 @@ public interface Platform {
      * 同步缺陷最新变更
      * 开源用户点击同步缺陷时调用
      */
-    SyncIssuesResult syncIssues(SyncIssuesRequest request);
+    SyncBugResult syncBugs(SyncBugRequest request);
 
     /**
      * 同步项目下所有的缺陷
      * 企业版用户会调用同步缺陷
      */
-    void syncAllIssues(SyncAllIssuesRequest request);
+    void syncAllBugs(SyncAllBugRequest request);
 
     /**
      * 获取附件内容
@@ -113,7 +113,7 @@ public interface Platform {
      * 同步 MS 缺陷附件到第三方平台
      * isAttachmentUploadSupport 返回为 true 时，同步和创建缺陷时会调用
      */
-    void syncIssuesAttachment(SyncIssuesAttachmentRequest request);
+    void syncBugsAttachment(SyncBugAttachmentRequest request);
 
     /**
      * 获取第三方平台的状态列表
@@ -126,10 +126,10 @@ public interface Platform {
      * 获取第三方平台的状态转移列表
      * 即编辑缺陷时的可选状态
      * 默认会调用 getStatusList，可重写覆盖
-     * @param issueId
+     * @param bugId
      * @return
      */
-    List<PlatformStatusDTO> getTransitions(String projectConfig, String issueId);
+    List<PlatformStatusDTO> getTransitions(String projectConfig, String bugId);
 
     /**
      * 用例关联需求时调用

backend/framework/plugin/src/main/java/io/metersphere/plugin/platform/dto/MsBugDTO.java

@@ -5,7 +5,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class MsIssueDTO {
+public class MsBugDTO {
 
     private String id;
 

backend/framework/plugin/src/main/java/io/metersphere/plugin/platform/dto/PlatformBugDTO.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class PlatformIssuesDTO extends MsIssueDTO {
+public class PlatformBugDTO extends MsBugDTO {
     private List<PlatformCustomFieldItemDTO> customFieldList;
     private List<PlatformAttachment> attachments = new ArrayList<>();
 }